Merge Development branch in to Master

Pull request to update feature files:

Feature 1: create_and_submit_proposal_basic.feature
Feature 2: create_and_finalize_new_award.feature