Changed some wording for objective and selection-based requirements.
Merge branch 'master' of ssh://github.com/commoncriteria/application