Updated travis ci
Merge branch 'develop'