admin  - user control
Merge branch 'admin-base'

Conflicts:
	app/views/User/userProfile.html
fix merge