omg pretty badges
Merge branch 'develop'