Merged pf_permission_screens
Conflicts:
	app/views/permissions/edit.html.haml