Merge branch 'master' into failoptions
fix
fix
set version to 2.3
Fix: SpecificationBundle:TestStep : checking the "automatic step" flag triggers the "expected support" as "automatic" again
Merge branch 'master' into v2.3
DashboardBundle: First draft of TaskManagement (only view, no real functionality yet)
Merge branch 'master' into failoptions

Conflicts:
	src/Ebbe/TestManager/SpecificationBundle/Resources/views/TestStep/new.html.twig
Merge branch 'failoptions' into beta
git locker
Merge branch 'master' into tasks
TaskBundle: first version (without commenting functionality)
TaggingBundle / TaskBundle: added Comment, included ContextData
fix
Merge branch 'tasks' into beta

Conflicts:
	web/js/common.js
fix
Merge branch 'tasks' into beta