diff --git a/gui/bower.json b/gui/bower.json
index 33167d6b..2be0adb6 100644
--- a/gui/bower.json
+++ b/gui/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "gui",
   "dependencies": {
-    "ember": "~2.5.0",
+    "ember": "~2.6.0",
     "ember-cli-shims": "0.1.1",
     "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0"
diff --git a/gui/package.json b/gui/package.json
index d182253a..bf7b8ef8 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -20,8 +20,8 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "0.7.1",
-    "ember-cli": "2.5.0",
+    "ember-ajax": "^2.0.1",
+    "ember-cli": "2.6.2",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-babel": "^5.1.6",
     "ember-cli-dependency-checker": "^1.2.0",
@@ -30,13 +30,14 @@
     "ember-cli-inject-live-reload": "^1.4.0",
     "ember-cli-jshint": "^1.0.0",
     "ember-cli-qunit": "^1.4.0",
-    "ember-cli-release": "0.2.8",
+    "ember-cli-release": "^0.2.9",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.5.0",
+    "ember-data": "^2.6.0",
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.5.1",
     "ember-resolver": "^2.0.3",
+    "ember-welcome-page": "^1.0.1",
     "loader.js": "^4.0.1"
   }
 }
diff --git a/gui/public/robots.txt b/gui/public/robots.txt
index 5e4ff3ea..f5916452 100644
--- a/gui/public/robots.txt
+++ b/gui/public/robots.txt
@@ -1,2 +1,3 @@
+# http://www.robotstxt.org
 User-agent: *
-Disallow: 
\ No newline at end of file
+Disallow:
diff --git a/gui/tests/helpers/module-for-acceptance.js b/gui/tests/helpers/module-for-acceptance.js
index 8c8b74ec..76996fd0 100644
--- a/gui/tests/helpers/module-for-acceptance.js
+++ b/gui/tests/helpers/module-for-acceptance.js
@@ -1,23 +1,23 @@
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
       this.application = startApp();
 
       if (options.beforeEach) {
-        options.beforeEach.apply(this, arguments);
+        return options.beforeEach.apply(this, arguments);
       }
     },
 
     afterEach() {
-      if (options.afterEach) {
-        options.afterEach.apply(this, arguments);
-      }
-
-      destroyApp(this.application);
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }