Updates to user and user groups continues
Merge branch 'master' of github.com:MarkVSullivan/SobekCM-Web-Application