Merge origin/master

Conflicts:
	src/WS/UserBundle/Controller/UserController.php
Merge origin/master