Test
Merge branch 'master' of github.com:InnovaLangues/PathBundle

Conflicts:
	Controller/PathController.php