ticket : getting deep inside
Merge branch 'develop' of github.com:42Zavattas/intra into develop

Conflicts:
	app/translations/en.json
	app/translations/fr.json