test
Merge branch 'feature/map_integration' of https://github.com/H4412/GHOME into feature/map_integration

Conflicts:
	src/Ghome/PompierBundle/Controller/GPSController.php
Merge branch 'feature/map_integration' of https://github.com/H4412/GHOME into feature/map_integration
no message
Merge branch 'feature/map_integration' of https://github.com/H4412/GHOME into feature/map_integration

Conflicts:
	src/Ghome/PompierBundle/Controller/GPSController.php