modification ActiviteMVC
Merge branch 'gestion_batterie'

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