Merge branch 'dev-master'
Renamed travel.yml to .travis.yml
Merge branch 'master' into dev-master