Gestion location infos
Merge branch 'master' of https://github.com/fredmontet/projet_mi

Conflicts:
	includes/templates/gestion_location_infos.tpl