Merge pull request #23 from jwendl/master

Submitted Activities Work
Merge pull request #4 from Magenic/master

Recent changes.
Merge pull request #24 from jwendl/master

Updates to bootstrap and CSLA
Merge pull request #25 from Bowman74/master

Merge pull request #4 from Magenic/master
Merge pull request #10 from Magenic/master

Merging from other changes.