test groupe
Merge branch 'master' of https://github.com/matthieu-beteille/poudre_server

Conflicts:
	config/locales/en.json
	config/routes.js