made changes to user
changes to role model for clarification
added new controller and updated status model
merging muza work from 12/1
Merge branch 'VIIJordon-master'