[gestion hors localisation
Merge branch 'master' of https://github.com/lemfi/PJMaintenant

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java