Load editRoles in shift edit
codeStyle
Bugfix
Merge branch 'master' into dev-form

Conflicts:
	module/ShiftBundle/Form/Admin/Shift/Edit.php