travis-ci build status for master
Merge branch 'dev'