Changed badges tof flat style.
Merge branch 'develop'