conformance target linked to criterion
Refactored test model
user proxy added
updated criteria widget
options attr for directives
build finalize step
updated locale
Merge branch 'master' into gh-pages
new build