Setting travis.yml
Merge branch 'hotfix'