diff -r 53a6985443f8 -r f2c2c80a49f7 cms/app-client/config/environment.js
--- a/cms/app-client/config/environment.js	Mon Sep 05 18:45:47 2016 +0200
+++ b/cms/app-client/config/environment.js	Thu Sep 22 15:34:10 2016 +0200
@@ -1,63 +1,45 @@
 /* jshint node: true */
 
 module.exports = function(environment) {
-  var ENV = {
-    rootElement: '#corpus-app',
-    modulePrefix: 'app-client',
-    environment: environment,
-    rootURL: '/corpus/',
-    locationType: 'hash',
-    // contentSecurityPolicy: {
-    //   'default-src': "'none'",
-    //   'style-src': "'self' 'http://localhost:4200'"
-    // },
-    EmberENV: {
-      FEATURES: {
-        // Here you can enable experimental features on an ember canary build
-        // e.g. 'with-controller': true
-      }
-    },
-
-    APP: {
-      baseStatic: '',
-      // Here you can pass flags/options to your application instance
-      // when it is created
+    var ENV = {
+        rootElement: '#corpus-app',
+        modulePrefix: 'app-client',
+        environment: environment,
+        rootURL: '/corpus/',
+        locationType: 'hash',
+        EmberENV: {
+            FEATURES: {
+                // Here you can enable experimental features on an ember canary build
+                // e.g. 'with-controller': true
+            }
+        },
+        APP: {
+            baseStatic: ''
+            // Here you can pass flags/options to your application instance
+            // when it is created
+        }
+    };
+    if (environment === 'development') {
+        ENV.APP.baseStatic = '';
+        ENV.contentSecurityPolicy = {
+            'default-src': "'none'",
+            'script-src': "'self' *",
+            'font-src': "'self'",
+            'connect-src': "'self' *",
+            'img-src': "'self'",
+            'style-src': "'self' *",
+            'media-src': "'self'"
+        };
     }
-  };
-
-  if (environment === 'development') {
-    ENV.APP.baseStatic = '';
-    // ENV.APP.LOG_RESOLVER = true;
-    // ENV.APP.LOG_ACTIVE_GENERATION = true;
-    // ENV.APP.LOG_TRANSITIONS = true;
-    // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
-    // ENV.APP.LOG_VIEW_LOOKUPS = true;
-    ENV.contentSecurityPolicy = {
-      'default-src': "'none'",
-      'script-src': "'self' *",
-      'font-src': "'self'",
-      'connect-src': "'self' *",
-      'img-src': "'self'",
-      'style-src': "'self' *",
-      'media-src': "'self'"
-    };
-  }
-
-  if (environment === 'test') {
-    // Testem prefers this...
-    ENV.rootURL = '/';
-    ENV.locationType = 'none';
-
-    // keep test console output quieter
-    ENV.APP.LOG_ACTIVE_GENERATION = false;
-    ENV.APP.LOG_VIEW_LOOKUPS = false;
-
-    ENV.APP.rootElement = '#ember-testing';
-  }
-
-  if (environment === 'production') {
-    ENV.APP.baseStatic = '/modules/corpus/app-client/';
-  }
-
-  return ENV;
-};
+    if (environment === 'test') {
+        ENV.rootURL = '/';
+        ENV.locationType = 'none';
+        ENV.APP.LOG_ACTIVE_GENERATION = false;
+        ENV.APP.LOG_VIEW_LOOKUPS = false;
+        ENV.APP.rootElement = '#ember-testing';
+    }
+    if (environment === 'production') {
+        ENV.APP.baseStatic = '/modules/corpus/app-client/';
+    }
+    return ENV;
+};
\ No newline at end of file