Merge pull request #112 from jwendl/master

Updating UX Mock ups
Merge pull request #29 from Magenic/master

Update from master
#96, added ability to filter the submitted activity collection by activity id.
Merge pull request #113 from Bowman74/master

#96, added ability to filter the submitted activity collection by act…
Merge pull request #32 from Magenic/master

Merging into my local branch