Vendor comment fix.
Fixed broken URL in FPT_API_EXT.1.2 and fixed merge conflict with FPT_API_EXT.1.2.
Merge branch 'master' of https://github.com/commoncriteria/application

Conflicts:
	input/application.xml