diff --git a/.jshintrc b/.jshintrc
index b11af91..08096ef 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -2,7 +2,7 @@
   "predef": [
     "document",
     "window",
-    "Promise"
+    "-Promise"
   ],
   "browser": true,
   "boss": true,
diff --git a/.travis.yml b/.travis.yml
index cf23938..66dd107 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: node_js
+node_js:
+  - "0.12"
 
 sudo: false
 
@@ -8,6 +10,7 @@ cache:
     - node_modules
 
 before_install:
+  - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
   - "npm config set spin false"
   - "npm install -g npm@^2"
 
diff --git a/.watchmanconfig b/.watchmanconfig
new file mode 100644
index 0000000..5e9462c
--- /dev/null
+++ b/.watchmanconfig
@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp"]
+}
diff --git a/Brocfile.js b/Brocfile.js
deleted file mode 100644
index a27c617..0000000
--- a/Brocfile.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* global require, module */
-
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
-
-var app = new EmberApp({
-    dotEnv: {
-        clientAllowedKeys: ['FIREBASE_URL']
-    },
-    sassOptions: {
-        inputFile: 'app.sass',
-        outputFile: 'share-drop.css'
-    }
-});
-
-// Use `app.import` to add additional libraries to the generated
-// output files.
-//
-// If you need to use different assets in different
-// environments, specify an object as the first parameter. That
-// object's keys should be the environment name and the values
-// should be the asset to use in that environment.
-//
-// If the library that you are including contains AMD or ES6
-// modules that you would like to import into your application
-// please specify an object with the list of modules as keys
-// along with the exports of each module as its value.
-
-app.import('vendor/peer.js');
-app.import('vendor/filer.min.js');
-app.import('vendor/ba-tiny-pubsub.min.js');
-app.import('vendor/idb.filesystem.min.js');
-app.import('vendor/underscore.js');
-app.import('vendor/jquery-uuid.js');
-
-app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
-
-module.exports = app.toTree();
diff --git a/bower.json b/bower.json
index 9e4a411..ae667e6 100644
--- a/bower.json
+++ b/bower.json
@@ -1,15 +1,15 @@
 {
   "name": "share-drop",
   "dependencies": {
-    "jquery": "^1.11.1",
-    "ember": "1.10.0",
-    "ember-resolver": "~0.1.12",
-    "loader.js": "ember-cli/loader.js#3.2.0",
+    "ember": "1.13.4",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
     "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
-    "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.2.8",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.1",
     "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.18",
+    "jquery": "^1.11.1",
+    "loader.js": "ember-cli/loader.js#3.2.0",
     "qunit": "~1.17.1"
   },
   "devDependencies": {
diff --git a/config/environment.js b/config/environment.js
index 4a1697d..44526d2 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -19,7 +19,7 @@ module.exports = function (environment) {
     },
 
     FIREBASE_URL: process.env.FIREBASE_URL
-};
+  };
 
   if (environment === 'development') {
     // ENV.APP.LOG_RESOLVER = true;
diff --git a/ember-cli-build.js b/ember-cli-build.js
new file mode 100644
index 0000000..5ae5693
--- /dev/null
+++ b/ember-cli-build.js
@@ -0,0 +1,33 @@
+/* global require, module */
+var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+
+module.exports = function(defaults) {
+  var app = new EmberApp(defaults, {
+      dotEnv: {
+          clientAllowedKeys: ['FIREBASE_URL']
+      }
+  });
+
+  // Use `app.import` to add additional libraries to the generated
+  // output files.
+  //
+  // If you need to use different assets in different
+  // environments, specify an object as the first parameter. That
+  // object's keys should be the environment name and the values
+  // should be the asset to use in that environment.
+  //
+  // If the library that you are including contains AMD or ES6
+  // modules that you would like to import into your application
+  // please specify an object with the list of modules as keys
+  // along with the exports of each module as its value.
+
+  app.import('vendor/peer.js');
+  app.import('vendor/filer.min.js');
+  app.import('vendor/ba-tiny-pubsub.min.js');
+  app.import('vendor/idb.filesystem.min.js');
+  app.import('vendor/underscore.js');
+  app.import('vendor/jquery-uuid.js');
+  app.import('bower_components/bootstrap/dist/js/bootstrap.min.js');
+
+  return app.toTree();
+};
diff --git a/package.json b/package.json
index 93626ef..3ab9804 100644
--- a/package.json
+++ b/package.json
@@ -20,19 +20,22 @@
   "author": "Szymon Nowak",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.0",
-    "ember-cli": "0.2.0",
-    "ember-cli-app-version": "0.3.2",
-    "ember-cli-babel": "^4.0.0",
-    "ember-cli-dependency-checker": "0.0.8",
+    "broccoli-asset-rev": "^2.0.2",
+    "ember-cli": "1.13.1",
+    "ember-cli-app-version": "0.4.0",
+    "ember-cli-babel": "^5.0.0",
+    "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-dotenv": "^0.3.4",
     "ember-cli-google-analytics": "^1.2.0",
-    "ember-cli-htmlbars": "0.7.4",
-    "ember-cli-ic-ajax": "0.1.1",
+    "ember-cli-htmlbars": "0.7.9",
+    "ember-cli-htmlbars-inline-precompile": "^0.1.1",
+    "ember-cli-ic-ajax": "0.2.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.3.9",
-    "ember-cli-sass": "3.0.6",
-    "ember-cli-uglify": "1.0.1",
+    "ember-cli-qunit": "0.3.15",
+    "ember-cli-release": "0.2.3",
+    "ember-cli-sass": "4.0.1",
+    "ember-cli-uglify": "^1.0.1",
+    "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2"
   },
   "dependencies": {
diff --git a/public/crossdomain.xml b/public/crossdomain.xml
index 29a035d..0c16a7a 100644
--- a/public/crossdomain.xml
+++ b/public/crossdomain.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE cross-domain-policy SYSTEM "http://www.adobe.com/xml/dtds/cross-domain-policy.dtd">
 <cross-domain-policy>
-    <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
+  <!-- Read this: www.adobe.com/devnet/articles/crossdomain_policy_file_spec.html -->
 
-    <!-- Most restrictive policy: -->
-    <site-control permitted-cross-domain-policies="none"/>
+  <!-- Most restrictive policy: -->
+  <site-control permitted-cross-domain-policies="none"/>
 
-    <!-- Least restrictive policy: -->
-    <!--
-    <site-control permitted-cross-domain-policies="all"/>
-    <allow-access-from domain="*" to-ports="*" secure="false"/>
-    <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
-    -->
+  <!-- Least restrictive policy: -->
+  <!--
+  <site-control permitted-cross-domain-policies="all"/>
+  <allow-access-from domain="*" to-ports="*" secure="false"/>
+  <allow-http-request-headers-from domain="*" headers="*" secure="false"/>
+  -->
 </cross-domain-policy>
diff --git a/public/robots.txt b/public/robots.txt
index 5debfa4..f591645 100644
--- a/public/robots.txt
+++ b/public/robots.txt
@@ -1,2 +1,3 @@
 # http://www.robotstxt.org
 User-agent: *
+Disallow:
diff --git a/testem.json b/testem.json
index 42a4ddb..0f35392 100644
--- a/testem.json
+++ b/testem.json
@@ -1,6 +1,7 @@
 {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
   "launch_in_ci": [
     "PhantomJS"
   ],
diff --git a/tests/.jshintrc b/tests/.jshintrc
index afb318a..6ec0b7c 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -6,30 +6,8 @@
     "setTimeout",
     "$",
     "-Promise",
-    "QUnit",
     "define",
     "console",
-    "equal",
-    "notEqual",
-    "notStrictEqual",
-    "test",
-    "asyncTest",
-    "testBoth",
-    "testWithDefault",
-    "raises",
-    "throws",
-    "deepEqual",
-    "start",
-    "stop",
-    "ok",
-    "ok",
-    "strictEqual",
-    "module",
-    "moduleFor",
-    "moduleForComponent",
-    "moduleForModel",
-    "process",
-    "expect",
     "visit",
     "exists",
     "fillIn",
@@ -40,8 +18,6 @@
     "findWithAssert",
     "wait",
     "DS",
-    "isolatedContainer",
-    "startApp",
     "andThen",
     "currentURL",
     "currentPath",
@@ -50,7 +26,7 @@
   "node": false,
   "browser": false,
   "boss": true,
-  "curly": false,
+  "curly": true,
   "debug": false,
   "devel": false,
   "eqeqeq": true,
@@ -71,5 +47,6 @@
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true
+  "esnext": true,
+  "unused": true
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index 16cc7c3..0f7aab1 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -1,6 +1,5 @@
 import Ember from 'ember';
 import Application from '../../app';
-import Router from '../../router';
 import config from '../../config/environment';
 
 export default function startApp(attrs) {
diff --git a/tests/unit/initializers/prerequisites-test.js b/tests/unit/initializers/prerequisites-test.js
deleted file mode 100644
index 4e3af4e..0000000
--- a/tests/unit/initializers/prerequisites-test.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Ember from 'ember';
-import { initialize } from 'share-drop/initializers/prerequisites';
-
-var container, application;
-
-module('PrerequisitesInitializer', {
-  setup: function() {
-    Ember.run(function() {
-      application = Ember.Application.create();
-      container = application.__container__;
-      application.deferReadiness();
-    });
-  }
-});
-
-// Replace this with your real tests.
-test('it works', function() {
-  initialize(container, application);
-
-  // you would normally confirm the results of the initializer here
-  ok(true);
-});
diff --git a/tests/unit/routes/application-test.js b/tests/unit/routes/application-test.js
deleted file mode 100644
index dc4018a..0000000
--- a/tests/unit/routes/application-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
-
-moduleFor('route:application', 'ApplicationRoute', {
-  // Specify the other units that are required for this test.
-  // needs: ['controller:foo']
-});
-
-test('it exists', function() {
-  var route = this.subject();
-  ok(route);
-});
diff --git a/tests/unit/routes/error-test.js b/tests/unit/routes/error-test.js
deleted file mode 100644
index c00fcdd..0000000
--- a/tests/unit/routes/error-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
-
-moduleFor('route:error', 'ErrorRoute', {
-  // Specify the other units that are required for this test.
-  // needs: ['controller:foo']
-});
-
-test('it exists', function() {
-  var route = this.subject();
-  ok(route);
-});
diff --git a/tests/unit/routes/index-test.js b/tests/unit/routes/index-test.js
deleted file mode 100644
index 73b0ec0..0000000
--- a/tests/unit/routes/index-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
-
-moduleFor('route:index', 'IndexRoute', {
-  // Specify the other units that are required for this test.
-  // needs: ['controller:foo']
-});
-
-test('it exists', function() {
-  var route = this.subject();
-  ok(route);
-});
diff --git a/tests/unit/routes/room-test.js b/tests/unit/routes/room-test.js
deleted file mode 100644
index 7deb6ab..0000000
--- a/tests/unit/routes/room-test.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
-
-moduleFor('route:room', 'RoomRoute', {
-  // Specify the other units that are required for this test.
-  // needs: ['controller:foo']
-});
-
-test('it exists', function() {
-  var route = this.subject();
-  ok(route);
-});