Merge origin/master

Conflicts:
	src/ITAS/BookBundle/Controller/UserController.php
Merge origin/master