Merge branch 'tpversions' into beta
Merge branch 'master' into beta

Conflicts:
	web/js/common.js
Merge branch 'tpversions' into beta
Merge branch 'tpversions' into beta
Merge branch 'tpversions' into beta
Merge branch 'tpversions' into beta
Merge branch 'area' into beta

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Entity/FailOption.php
	src/Ebbe/TestManager/SpecificationBundle/Entity/TestStep.php
Merge branch 'area' into beta
Merge branch 'expectedoutput_failoption' into beta
Merge branch 'tpversions' into beta
Merge branch 'v2.2.1' into beta

Conflicts:
	web/js/common.js
Merge branch 'contextdata' into beta
Merge branch 'contextdata' into beta
Merge branch 'contextdata' into beta
Merge branch 'contextdata' into beta
Merge branch 'contextdata' into beta
Merge branch 'contextdata' into beta
Merge branch 'failoptions' into beta

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Entity/FailOption.php
	web/js/common.js
Merge branch 'master' into beta
Merge branch 'master' into beta

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Controller/TestProcedureController.php
	src/Ebbe/TestManager/SpecificationBundle/Controller/TestStepController.php
	src/Ebbe/TestManager/SpecificationBundle/Form/TestStepType.php