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
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.
Fixing activity submit to the way it was before the workaround.
FIxing issue #58 and #59
Merge pull request #79 from Bowman74/master

#62, now the requries approval shows up when adding an activity.  This s...
Merge pull request #23 from Magenic/master

Merging in changes with my mainline.
Fixing issue #77
Merge pull request #80 from jwendl/master

Fixing various bugs.
Merge pull request #22 from Magenic/master

Merge from Master