Merge branch 'master' into feature/store-models-in-service

# Conflicts:
#	app/controllers/index.js
#	tests/unit/controllers/index-test.js

app/routes/application.js

@@ -13,6 +13,8 @@ export default Route.extend({
           transition.retry();
         }
       }
+    }).catch((error) => {
+      console.log('Error initializing Kredits', error);
     });
   },