Fixed Badges. Users can now create badges as needed.
Merge remote-tracking branch 'origin/master'