fix travis.yml
Merge branch 'develop' into staging