reco vocale
branche recherche
suppression anciens boutons
Merge branch 'master' of https://github.com/lemfi/PJMaintenant.git

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
pb d'import
Merge branch 'master' of https://github.com/lemfi/PJMaintenant.git

Conflicts:
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivityVue.java
	src/fr/pjdroidteam/pjmaintenant/activites/splashscreen/SplashScreen.java
intégration design reco vocale
design reco vocale
Corrections zoom