Ajouter la localisation
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/components/map/map.controller.js