Added support for specifying a sponsor type.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	features/step_definitions/edit_proposal.rb