Merge pull request #488 from jay-hodgson/release-7

backing out SWC-715 to fix submissions
add access_type.submit to can_participate_evaluation and can_administer_evaluation permission levels