Updated System so that there are only 2 usertypes Admin and Not Admin.
Merge branch 'master' into HelpDocs
Updated Help page to use the new Usertypes.