finished CMS fixes requested by Amie
Merge branch 'master' of https://github.com/amdixon/massgroup