minor edits for clarity
Merge branch 'master' of https://github.com/commoncriteria/application

Conflicts:
	input/application.xml