added travis and badges
Merge branch 'badges' into develop