removed user page controller, added HTML stripping of tags, and user modal changes
Merge branch 'master' of https://github.com/ChrisWren/CMS