GH138: Create ability for admins to change password for users
GH138: Create ability for admins to change password for users
Fixed comments for commit 90eb84a2b8a7aaaad88c348ccc181fed25500555
Merge branch 'GH138'

Conflicts:
	app/controllers/ProfileadminController.php