Conflicts:
	features/post_award/kc_award/award_action_request.feature
	features/step_definitions/proposal_development/proposal_create.rb
corrections to my attempted PR.
Merge pull request #6 from jonutter/squashed_branch

Changes for navigation.