rename current_user to current_admin_user
Merge branch 'master' of https://github.com/empowerunited/manage

Conflicts:
	app/controllers/manage/application_controller.rb
version bump