Restrict roles available for User/Add and User/Edit

Conflicts:
	applications/dashboard/controllers/class.usercontroller.php
Fixes User/Edit to not allow escalation via password and revises role editing
User.Edit trumps PersonalInfo.View
Compatibility for Reporting 2.0
Merge branch 'master' of github.com:vanillaforums/Garden