Fix numerous CodePro flags
Merge branch 'develop' into feature-98-open_requirements_front_end
Merge pull request #74 from R2-Team2/feature-98-open_requirements_front_end

Feature 98 open requirements front end (CodePro Cleanup)