Merge branch 'develop'
Adding Master travis badge
Merge branch 'master' into develop