ExecutionBundle:TestRun : added "archived" as filter criterion
Merge branch 'area' into v2.2
Merge branch 'tpversions' into v2.2

Conflicts:
	web/js/common.js
Addapted version
SpecificationBundle / ConfigManagementBundle : TestProcedure : edit: Subject now shown with identifier
fix
Merge branch 'master' into v2.2
ConfigManagementBundle:ReleaseVersions : added filtering / sorting to index view
Merge branch 'master' into v2.2
SpecificationBundle:TestOracle : import : now also takes into account the Area
version updated to v2.2.1
Merge branch 'v2.2.1' into beta

Conflicts:
	web/js/common.js