diff -r 89be68e13215 -r f0609941aa98 cms/app-client/bower.json
--- a/cms/app-client/bower.json	Wed Jan 20 13:04:27 2016 +0100
+++ b/cms/app-client/bower.json	Wed Jan 20 15:53:27 2016 +0100
@@ -1,19 +1,26 @@
 {
   "name": "app-client",
   "dependencies": {
-    "ember": "1.13.7",
-    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "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": "1.13.8",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
-    "ember-qunit": "0.4.9",
-    "ember-qunit-notifications": "0.0.7",
-    "ember-resolver": "~0.1.18",
+    "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",
     "jquery": "^1.11.3",
-    "loader.js": "ember-cli/loader.js#3.2.1",
+    "loader.js": "ember-cli/loader.js#3.5.0",
     "qunit": "~1.18.0",
-    "bootstrap-sass": "~3.3.5",
+    "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"
   }
 }