added badges and .travis.yml
Merge branch 'badges' into develop