Replaced all 'with with' with 'with'
Merge branch 'master' of ssh://github.com/commoncriteria/application
Fixed fpt_aex_ext_.1.2 so that everything just doesn't pass