Merge pull request #65 from reTHINK-project/develop

Merge Develop to master

.travis.yml

@@ -8,17 +8,26 @@ node_js:
 services:
   - docker
 
+test: karma start
+
 before_install:
   - sudo setcap 'cap_net_bind_service=+ep' `which node`
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
   - git clone --branch=develop https://github.com/reTHINK-project/dev-hyperty.git
   - export HYPERTY_REPO=./dev-hyperty
-  - git clone https://github.com/reTHINK-project/dev-protostubs.git
+  - git clone --branch=develop https://github.com/reTHINK-project/dev-protostubs.git
   - export PROTOSTUB_REPO=./dev-protostubs
+  - cd dev-hyperty
+  - npm run install:all
+  - sleep 200
+  - cd ../dev-protostubs
+  - npm run install:all
+  - sleep 200
+  - cd ..
 
 install:
   - npm install
   - npm run start:all &
-  - sleep 60
+  - sleep 200