Add travis badge
Merge branch 'develop'