Conflicts:
	features/proposal_development/proposal_permissions.feature
Resolved a conflict: Now using an asterisk for background steps in prop_perms.feature