Merge pull request #15 from Magenic/master

Pulling in changes from base line.
Merge pull request #16 from Magenic/master

Grabbing current fork version.
Made badge/index default page, fixed Authentication.
Lots of changes to BadgeManager

Made add / edit badges work
Made add / edit / delete Activities work
Fixed minor layout bugs.
Merge pull request #45 from jwendl/master

Merging changes back into mainline.