Merge origin/master

Conflicts:
	src/Sage/MenuBundle/Controller/ModuloController.php