Added search permissions by their name... was by controllecr_name and action_name
Merge branch 'i19300' into development

Conflicts:
	lib/global_roles/user_patch.rb
Merge branch 'development'