fix(.travis.yml): For master branch
Merge branch 'dev'