Merge branch 'master' into develop
Updating env value for sauce connection
Second attempt at travis-ci
Merge branch 'hotfix/travis-ci'