SpecificationBundle:FailOption : corrected wrong inverse side relations
Merge branch 'master' into teststeptemplate_failoption

Conflicts:
	web/js/common.js
Merge branch 'expectedoutput_failoption' into failoptions
version to v2.2.2
Merge branch 'master' into failoptions

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Entity/FailOption.php
	src/Ebbe/TestManager/SpecificationBundle/Entity/TestStep.php
ConfigManagementBundle : ContextData : improved templating for easier reusability when creating new ContextDatas via modal dialog
ContextData: rolling out new optimized handling for creating new ContextDatas via modal dialog to all affected entity views
Merge branch 'master' into contextdata
Merge branch 'v2.2.2' into failoptions

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Resources/views/ExpectedOutput/edit.html.twig
	src/Ebbe/TestManager/SpecificationBundle/Resources/views/TestStep/edit.html.twig
	src/Ebbe/TestManager/SpecificationBundle/Resources/views/TestStep/new.html.twig
Merge branch 'failoptions' into beta

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Entity/FailOption.php
	web/js/common.js