Merge branch 'map' of https://github.com/ISEN-CIR3/diapazen into map

Conflicts:
	feature/map/index.php