Changed badges to flat style.
Merge branch 'develop'