Merge branch 'master' into develop

# Conflicts:
#	.travis.yml

.travis.yml

@@ -1,4 +1,4 @@
-sudo: true
+sudo: required
 dist: trusty
 
 language: node_js
@@ -12,14 +12,10 @@ before_install:
   # If ever run on windows make sure you don't run this in the git bash!
   - docker run -dit --name emscripten -v "$(pwd)":"/src/" trzeci/emscripten:sdk-incoming-64bit bash
   - chmod +x ./scripts/travis.sh
+  - chmod +x ./scripts/travis_deploy.sh
   - chmod +x ./scripts/travis_deploy_dev_server.sh
   - chmod +x ./scripts/travis_deploy_github.sh
 
-branches:
-  only:
-    - master
-    - develop
-
 stages:
   - compile
   # - test We've no tested defined yet

scripts/travis_deploy_github.sh

@@ -4,8 +4,8 @@ PACKAGES_DIRECTORY="auto-build/packages/"
 LOG_FILE="auto-build/logs/build.log"
 
 if [[ -z "${GIT_AUTHTOKEN}" ]]; then
-    echo "Missing environment variable GIT_AUTHTOKEN. Please set it before usign this script!"
-    exit 1
+    echo "GIT_AUTHTOKEN isn't set. Don't deploying build!"
+    exit 0
 fi
 
 GIT_COMMIT_SHORT=$(git rev-parse --short HEAD)