update to current branch

.gitignore

@@ -1,7 +1,9 @@
+app/bower_components/
+node_modules/
+
 #################
 ## Eclipse
 #################
-
 *.pydevproject
 .project
 .metadata
@@ -217,4 +219,4 @@ pip-log.txt
 
 #Test result ignore
 test_out/unit.xml
-test_out/e2e.xml
+test_out/e2e.xml

app/config.js

@@ -15,7 +15,7 @@ angular.module('myApp.config', [])
 
   // double check that the app has been configured before running it and blowing up space and time
   .run(['FBURL', '$timeout', function(FBURL, $timeout) {
-    if( FBURL.match('//INSTANCE.firebaseio.com') ) {
+    if( FBURL.match('https://af-seed-picocosmos.firebaseio.com') ) {
       angular.element(document.body).html('<h1>Please configure app/config.js before running!</h1>');
       $timeout(function() {
         angular.element(document.body).removeClass('hide');

e2e-tests/protractor-conf.js

@@ -6,7 +6,8 @@ exports.config = {
   ],
 
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': 'chrome',
+    'chromeOptions': {'args': ['test-type'] }
   },
 
   baseUrl: 'http://localhost:8000/app/',