Merge pull request #71 from jwendl/master

Fixing #53, #56, #63, #58, #59, #60, #61, #64
Merge pull request #21 from Magenic/master

Merge from Master
#73, fixed bug where users without any earned badges would receive an error on the account information screen.
Merge pull request #74 from Bowman74/master

#73, fixed bug where users without any earned badges would receive an error when looking at account information
#54 Fixed problem with submitting an activity.
Merge pull request #75 from Bowman74/master

#54 Fixed problem with submitting an activity.
Merge pull request #22 from Magenic/master

Moving code into my mainline.