diff -r bc37828169f3 -r 6b32182a7fba server/bo_client/package.json
--- a/server/bo_client/package.json	Fri Apr 08 17:23:17 2016 +0200
+++ b/server/bo_client/package.json	Fri Apr 08 18:41:51 2016 +0200
@@ -23,7 +23,7 @@
     "bower": "^1.7.9",
     "broccoli-asset-rev": "^2.4.2",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.0",
+    "broccoli-merge-trees": "^1.1.1",
     "broccoli-static-compiler": "^0.2.2",
     "corpus-common-addon": "file:../../common/corpus-common-addon",
     "ember-ajax": "0.7.1",
@@ -32,7 +32,6 @@
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-dependency-checker": "^1.2.0",
-    "ember-font-awesome": "^2.1.0",
     "ember-cli-htmlbars": "^1.0.3",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
@@ -41,9 +40,11 @@
     "ember-cli-sass": "5.3.1",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
+    "ember-component-css": "0.1.9",
     "ember-data": "^2.4.2",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
+    "ember-font-awesome": "^2.1.0",
     "ember-i18n": "4.2.0",
     "ember-load-initializers": "^0.5.1",
     "ember-lodash": "0.0.6",