add small feature br requested
Merge branch 'master' of https://github.com/LitusProject/Litus
Small js fix
bugfix and improvement shifts
Merge branch 'master' of https://github.com/LitusProject/Litus
Merge branch 'master' into dev-form

Conflicts:
	module/SyllabusBundle/Controller/Admin/GroupController.php
	module/SyllabusBundle/Form/Admin/Group/Study/Add.php