# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1455062922 -3600
# Node ID b495d8c1bf4fc7bbaa0bebeaac112cc3f51f7136
# Parent  dbcacab69cfc50488dab4b94454aaae2e95db84b
upgrade packages version, correct dependencies

diff -r dbcacab69cfc -r b495d8c1bf4f cms/app-client/app/app.js
--- a/cms/app-client/app/app.js	Fri Feb 05 22:41:10 2016 +0100
+++ b/cms/app-client/app/app.js	Wed Feb 10 01:08:42 2016 +0100
@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember/resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from 'ember-resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 var App;
diff -r dbcacab69cfc -r b495d8c1bf4f cms/app-client/app/index.html
--- a/cms/app-client/app/index.html	Fri Feb 05 22:41:10 2016 +0100
+++ b/cms/app-client/app/index.html	Wed Feb 10 01:08:42 2016 +0100
@@ -33,7 +33,7 @@
     {{content-for 'body'}}
     <div id="corpus-app" class="corpus-app"></div>
 
-    <script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1.1','packages':['treemap']}]}"></script>
+    <!--script type="text/javascript" src="https://www.google.com/jsapi?autoload={'modules':[{'name':'visualization','version':'1.1','packages':['treemap']}]}"></script-->
     <script src="assets/vendor.js"></script>
     <script src="assets/app-client.js"></script>
     <script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
diff -r dbcacab69cfc -r b495d8c1bf4f cms/app-client/bower.json
--- a/cms/app-client/bower.json	Fri Feb 05 22:41:10 2016 +0100
+++ b/cms/app-client/bower.json	Wed Feb 10 01:08:42 2016 +0100
@@ -1,27 +1,14 @@
 {
   "name": "app-client",
   "dependencies": {
-    "ember": "2.2.0",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.6",
-    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-data": ">=2.1.0",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.7",
-    "ember-qunit": ">=0.4.9",
-    "ember-qunit-notifications": ">=0.0.7",
-    "ember-resolver": ">=0.1.18",
+    "ember": "2.3.1",
+    "ember-cli-shims": "0.1.0",
+    "ember-cli-test-loader": "0.2.2",
+    "ember-qunit-notifications": ">=0.1.0",
     "jquery": "^2.1",
-    "loader.js": "ember-cli/loader.js#3.5.0",
     "qunit": "~1.18.0",
     "bootstrap-sass": "bootstrap-sass-official#~3.3.6",
     "ammap3": "~3.18.6",
     "font-awesome": "~4.4.0"
-  },
-  "resolutions": {
-    "qunit-notifications": "~0.1.0",
-    "ember-load-initializers": "0.1.7",
-    "loader.js": "3.5.0",
-    "ember-cli-shims": "0.0.6",
-    "ember": "2.2.0",
-    "jquery": ">= 1.7.0 < 2.2.0"
   }
 }
diff -r dbcacab69cfc -r b495d8c1bf4f cms/app-client/package.json
--- a/cms/app-client/package.json	Fri Feb 05 22:41:10 2016 +0100
+++ b/cms/app-client/package.json	Wed Feb 10 01:08:42 2016 +0100
@@ -19,29 +19,36 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "bower": "^1.7.7",
-    "broccoli-asset-rev": "^2.1.2",
-    "ember-cli": "1.13.8",
-    "ember-cli-app-version": "0.5.0",
-    "ember-cli-babel": "^5.1.3",
-    "ember-cli-content-security-policy": "0.4.0",
+    "bower": "^1.7.6",
+    "broccoli-asset-rev": "^2.3.0",
+    "broccoli-funnel": "^1.0.1",
+    "broccoli-merge-trees": "^1.1.0",
+    "broccoli-static-compiler": "^0.2.2",
+    "ember-ajax": "0.7.1",
+    "ember-cli": "2.3.0-beta.2",
+    "ember-cli-app-version": "^1.0.0",
+    "ember-cli-babel": "^5.1.6",
+    "ember-cli-content-security-policy": "^0.5.0",
     "ember-cli-d3": "1.1.2",
-    "ember-cli-dependency-checker": "^1.0.1",
-    "ember-cli-font-awesome": "1.3.0",
-    "ember-cli-htmlbars": "0.7.9",
-    "ember-cli-htmlbars-inline-precompile": "^0.2.0",
-    "ember-cli-ic-ajax": "0.2.1",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-font-awesome": "^1.3.0",
+    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-ic-ajax": "0.2.4",
     "ember-cli-inject-live-reload": "^1.3.1",
-    "ember-cli-qunit": "^1.0.0",
-    "ember-cli-release": "0.2.3",
-    "ember-cli-sass": "5.0.1",
-    "ember-cli-sri": "^1.0.3",
+    "ember-cli-qunit": "^1.2.1",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sass": "5.2.0",
+    "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "1.13.8",
+    "ember-data": "^2.3.1",
     "ember-data-fixture-adapter": "1.13.0",
-    "ember-disable-proxy-controllers": "^1.0.0",
-    "ember-export-application-global": "^1.0.3",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.5",
+    "ember-load-initializers": "^0.5.0",
     "ember-lodash": "0.0.6",
-    "ember-wormhole": "0.3.4"
+    "ember-resolver": "^2.0.3",
+    "ember-wormhole": "0.3.5",
+    "loader.js": "^4.0.0"
   }
 }
diff -r dbcacab69cfc -r b495d8c1bf4f server/bo_client/bower.json
--- a/server/bo_client/bower.json	Fri Feb 05 22:41:10 2016 +0100
+++ b/server/bo_client/bower.json	Wed Feb 10 01:08:42 2016 +0100
@@ -4,10 +4,9 @@
     "ember": "2.3.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
-    "ember-load-initializers": "0.1.7",
     "ember-qunit-notifications": "0.1.0",
     "jquery": "1.11.3",
-    "loader.js": "^3.5.0",
+    "loader.js": "^4.0.0",
     "qunit": "~1.20.0",
     "bootstrap-sass": "bootstrap-sass-official#~3.3.6",
     "font-awesome": "~4.5.0",
diff -r dbcacab69cfc -r b495d8c1bf4f server/bo_client/package.json
--- a/server/bo_client/package.json	Fri Feb 05 22:41:10 2016 +0100
+++ b/server/bo_client/package.json	Wed Feb 10 01:08:42 2016 +0100
@@ -22,14 +22,14 @@
     "bower": "^1.7.6",
     "broccoli-asset-rev": "^2.3.0",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.0.0",
+    "broccoli-merge-trees": "^1.1.0",
     "broccoli-static-compiler": "^0.2.2",
     "ember-aupac-typeahead": "2.0.4",
     "ember-ajax": "0.7.1",
     "ember-cli": "2.3.0-beta.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
-    "ember-cli-content-security-policy": "0.4.0",
+    "ember-cli-content-security-policy": "^0.5.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-font-awesome": "^1.3.0",
     "ember-cli-htmlbars": "^1.0.1",