--- a/cms/app-client/.watchmanconfig	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/.watchmanconfig	Wed Mar 02 13:47:07 2016 +0100
@@ -1,3 +1,3 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp", "dist"]
 }

--- a/cms/app-client/app/app.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/app/app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,9 +1,9 @@
 import Ember from 'ember';
-import Resolver from 'ember-resolver';
+import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
@@ -11,7 +11,7 @@
   rootElement: config.rootElement,
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
-  Resolver: Resolver
+  Resolver
 });
 
 loadInitializers(App, config.modulePrefix);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/app/resolver.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

--- a/cms/app-client/app/router.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/app/router.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import config from './config/environment';
 
-var Router = Ember.Router.extend({
+const Router = Ember.Router.extend({
   location: config.locationType
 });
 

--- a/cms/app-client/bower.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/bower.json	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
 {
   "name": "app-client",
   "dependencies": {
-    "ember": "~2.3.1",
+    "ember": "~2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",

--- a/cms/app-client/ember-cli-build.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/ember-cli-build.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 

--- a/cms/app-client/package.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/package.json	Wed Mar 02 13:47:07 2016 +0100
@@ -27,7 +27,7 @@
     "broccoli-static-compiler": "^0.2.2",
     "corpus-common-addon": "file:../../common/corpus-common-addon",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "^2.4.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-d3": "1.1.2",
@@ -43,7 +43,7 @@
     "ember-cli-sass": "5.2.0",
     "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.3.1",
+    "ember-data": "^2.4.0",
     "ember-data-fixture-adapter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/testem.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};

--- a/cms/app-client/testem.json	Tue Mar 01 23:35:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-{
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
-  ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/tests/helpers/destroy-app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cms/app-client/tests/helpers/module-for-acceptance.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+
+      destroyApp(this.application);
+    }
+  });
+}

--- a/cms/app-client/tests/helpers/resolver.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/tests/helpers/resolver.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
-import Resolver from 'ember/resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,

--- a/cms/app-client/tests/helpers/start-app.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/tests/helpers/start-app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -3,12 +3,12 @@
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();

--- a/cms/app-client/tests/index.html	Tue Mar 01 23:35:33 2016 +0100
+++ b/cms/app-client/tests/index.html	Wed Mar 02 13:47:07 2016 +0100
@@ -7,28 +7,28 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
-    {{content-for 'head'}}
-    {{content-for 'test-head'}}
+    {{content-for "head"}}
+    {{content-for "test-head"}}
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/app-client.css">
     <link rel="stylesheet" href="assets/test-support.css">
 
-    {{content-for 'head-footer'}}
-    {{content-for 'test-head-footer'}}
+    {{content-for "head-footer"}}
+    {{content-for "test-head-footer"}}
   </head>
   <body>
+    {{content-for "body"}}
+    {{content-for "test-body"}}
 
-    {{content-for 'body'}}
-    {{content-for 'test-body'}}
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/app-client.js"></script>
     <script src="assets/tests.js"></script>
-    <script src="testem.js"></script>
     <script src="assets/test-loader.js"></script>
 
-    {{content-for 'body-footer'}}
-    {{content-for 'test-body-footer'}}
+    {{content-for "body-footer"}}
+    {{content-for "test-body-footer"}}
   </body>
 </html>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/corpus-common-addon/.gitignore	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,17 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+
+# dependencies
+/node_modules
+/bower_components
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage/*
+/libpeerconnection.log
+npm-debug.log
+testem.log

--- a/common/corpus-common-addon/.npmignore	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/.npmignore	Wed Mar 02 13:47:07 2016 +0100
@@ -13,4 +13,4 @@
 .travis.yml
 bower.json
 ember-cli-build.js
-testem.json
+testem.js

--- a/common/corpus-common-addon/.travis.yml	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/.travis.yml	Wed Mar 02 13:47:07 2016 +0100
@@ -11,6 +11,7 @@
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1-13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary

--- a/common/corpus-common-addon/bower.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/bower.json	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
 {
   "name": "corpus-common-addon",
   "dependencies": {
-    "ember": "~2.3.1",
+    "ember": "~2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0"

--- a/common/corpus-common-addon/config/ember-try.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/config/ember-try.js	Wed Mar 02 13:47:07 2016 +0100
@@ -8,6 +8,17 @@
       }
     },
     {
+      name: 'ember-1-13',
+      bower: {
+        dependencies: {
+          'ember': '~1.13.0'
+        },
+        resolutions: {
+          'ember': '~1.13.0'
+        }
+      }
+    },
+    {
       name: 'ember-release',
       bower: {
         dependencies: {

--- a/common/corpus-common-addon/package.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/package.json	Wed Mar 02 13:47:07 2016 +0100
@@ -21,7 +21,7 @@
     "bower": "^1.7.6",
     "broccoli-asset-rev": "^2.2.0",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.3.0",
+    "ember-cli": "^2.4.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
@@ -30,7 +30,7 @@
     "ember-cli-release": "0.2.8",
     "ember-cli-sri": "^2.0.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.3.0",
+    "ember-data": "^2.4.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/corpus-common-addon/testem.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};

--- a/common/corpus-common-addon/testem.json	Tue Mar 01 23:35:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-{
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
-  ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
-}

--- a/common/corpus-common-addon/tests/helpers/module-for-acceptance.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/common/corpus-common-addon/tests/helpers/module-for-acceptance.js	Wed Mar 02 13:47:07 2016 +0100
@@ -13,11 +13,11 @@
     },
 
     afterEach() {
-      destroyApp(this.application);
-
       if (options.afterEach) {
         options.afterEach.apply(this, arguments);
       }
+
+      destroyApp(this.application);
     }
   });
 }

--- a/server/bo_client/.watchmanconfig	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/.watchmanconfig	Wed Mar 02 13:47:07 2016 +0100
@@ -1,4 +1,4 @@
 {
-  "ignore_dirs": ["tmp"],
+  "ignore_dirs": ["tmp", "dist"],
   "root_files": ["../src/resources/assets/sass/app.scss"]
 }

--- a/server/bo_client/app/app.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/app/app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,9 +1,9 @@
 import Ember from 'ember';
-import Resolver from 'ember-resolver';
+import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-var App;
+let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/bo_client/app/resolver.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

--- a/server/bo_client/app/router.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/app/router.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
 import Ember from 'ember';
 import config from './config/environment';
 
-var Router = Ember.Router.extend({
+const Router = Ember.Router.extend({
   location: config.locationType
 });
 

--- a/server/bo_client/bower.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/bower.json	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
 {
   "name": "bo-client",
   "dependencies": {
-    "ember": "~2.3.1",
+    "ember": "~2.4.1",
     "ember-cli-shims": "0.1.0",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
@@ -15,7 +15,6 @@
     "store": "https://github.com/marcuswestin/store.js.git#v1.3.20"
   },
   "resolutions": {
-    "ember": "2.3.1",
     "jquery": ">=2.2"
   }
 }

--- a/server/bo_client/ember-cli-build.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/ember-cli-build.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,3 +1,4 @@
+/*jshint node:true*/
 /* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-app');
 var pickFiles = require('broccoli-static-compiler');

--- a/server/bo_client/package.json	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/package.json	Wed Mar 02 13:47:07 2016 +0100
@@ -28,23 +28,20 @@
     "corpus-common-addon": "file:../../common/corpus-common-addon",
     "ember-ajax": "0.7.1",
     "ember-aupac-typeahead": "2.0.4",
-    "ember-cli": "2.3.0",
+    "ember-cli": "^2.4.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
-    "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",
     "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.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-component-css": "0.1.6",
-    "ember-data": "^2.3.1",
+    "ember-data": "^2.4.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
     "ember-i18n": "4.2.0",
@@ -56,9 +53,9 @@
     "glob": "^6.0.1",
     "http-proxy": "^1.12.0",
     "loader.js": "^4.0.0",
+    "lodash": "^4.5.1",
     "morgan": "^1.6.1",
     "npm-check-updates": "^2.5.1",
     "walk-sync": "^0.2.6"
-  },
-  "dependencies": {}
+  }
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/bo_client/testem.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};

--- a/server/bo_client/testem.json	Tue Mar 01 23:35:33 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-{
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "PhantomJS"
-  ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/bo_client/tests/helpers/destroy-app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,5 @@
+import Ember from 'ember';
+
+export default function destroyApp(application) {
+  Ember.run(application, 'destroy');
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/server/bo_client/tests/helpers/module-for-acceptance.js	Wed Mar 02 13:47:07 2016 +0100
@@ -0,0 +1,23 @@
+import { module } from 'qunit';
+import startApp from '../helpers/start-app';
+import destroyApp from '../helpers/destroy-app';
+
+export default function(name, options = {}) {
+  module(name, {
+    beforeEach() {
+      this.application = startApp();
+
+      if (options.beforeEach) {
+        options.beforeEach.apply(this, arguments);
+      }
+    },
+
+    afterEach() {
+      if (options.afterEach) {
+        options.afterEach.apply(this, arguments);
+      }
+
+      destroyApp(this.application);
+    }
+  });
+}

--- a/server/bo_client/tests/helpers/resolver.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/tests/helpers/resolver.js	Wed Mar 02 13:47:07 2016 +0100
@@ -1,7 +1,7 @@
-import Resolver from 'ember-resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
-var resolver = Resolver.create();
+const resolver = Resolver.create();
 
 resolver.namespace = {
   modulePrefix: config.modulePrefix,

--- a/server/bo_client/tests/helpers/start-app.js	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/tests/helpers/start-app.js	Wed Mar 02 13:47:07 2016 +0100
@@ -3,12 +3,12 @@
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
-  var application;
+  let application;
 
-  var attributes = Ember.merge({}, config.APP);
+  let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Ember.run(function() {
+  Ember.run(() => {
     application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();

--- a/server/bo_client/tests/index.html	Tue Mar 01 23:35:33 2016 +0100
+++ b/server/bo_client/tests/index.html	Wed Mar 02 13:47:07 2016 +0100
@@ -18,13 +18,14 @@
     {{content-for "test-head-footer"}}
   </head>
   <body>
-
     {{content-for "body"}}
     {{content-for "test-body"}}
+
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/bo-client.js"></script>
-    <script src="testem.js"></script>
+    <script src="assets/tests.js"></script>
     <script src="assets/test-loader.js"></script>
 
     {{content-for "body-footer"}}