Bugfix
Merge branch 'master' of github.com:LitusProject/Litus

Conflicts:
	module/SyllabusBundle/src/Resources/config/module.config.php
Merge branch 'master' of github.com:LitusProject/Litus

Conflicts:
	module/SyllabusBundle/src/Resources/config/module.config.php