Merged
Merge branch 'master' into pathautocomplete

Conflicts:
	app/Resources/views/base.html.twig
	app/config/config.yml
	src/Innova/LearningPathBundle/Controller/PathController.php
	src/Innova/LearningPathBundle/Resources/public/js/script.js
	web/js/fos_js_routes.js
Merge pull request #22 from ALouis38/pathautocomplete

Pathautocomplete