added badges and travis
Merge branch 'badges' into develop