Merge pull request #18 from Magenic/master

Merging into my fork.
Fixing compile errors.
Initial stab at solving activity generation issue.
Fixing issue #53
Working on popup tooltips for badges.
Finishing touches on the popup tooltips for badges.
Submitting changes before compile fixes.
Revert "Fixing compile errors."

This reverts commit 8a075ead0afdaeb19648a4aadca5cb16f5770be3.
Merge pull request #19 from Magenic/master

Bringing changes from main fork.
Merge remote-tracking branch 'origin/Working-Directory'
Fixing issue #63 - Made the activities grid work
Minor changes to remove bottom footer of window dialogues.
Fixing issue #58
Fixing issue #59
Fixing issue #60
Fixing issue #61
Fixing issue #64
Merge pull request #21 from Magenic/master

Merging into my main fork.
Fixing ActivityStatus Controller call.

Still broken though for submitting activities because of query in
DefaultActivityStatus.
Handling Andrew's CSS recommendations.