Merge branch 'develop'
Merge branch 'hotfix-travis'
Tweaking Travis CI config
Tweaking Travis CI config
Adding travis badge for master branch
Merge branch 'hotfix-travis' into develop