Merge pull request #3 from orionsbelt-battlegrounds/master

Badges refactoring