Completion of Adding Funding Proposals to Award, with related code tested and complete.
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	features/step_definitions/awards/award_view.rb