Fix has_permission_from_ministry_or_higher to include passed ministry
Merge branch 'c4c.staging' into c4c.prod

Conflicts:
	lib/common/core/person.rb