travis ci in only branch develop and master
Merge branch 'hotfix/travis-ci'