Delete .travis.yml~
Merge branch 'dev'