Merge branch '1.4' into csm-merge-1.4

Conflicts:
	priv/admin/js/core.js
	priv/admin/js/generated/templates.js
	rebar.config
	src/riak_control_formatting.erl
	src/riak_control_session.erl
	src/riak_control_wm_cluster.erl

src/riak_control.app.src

@@ -1,7 +1,7 @@
 {application, riak_control,
  [
   {description, "Riak Admin Interface"},
-  {vsn, "1.4.0"},
+  {vsn, "1.4.1"},
   {registered, []},
   {applications, [
                   kernel,