Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php