Modified .travis.yml
Merge branch 'develop'