Début de la recherche
Merge branch 'master' of https://github.com/bsaleil/um2-android
Merge branch 'master' of https://github.com/bsaleil/um2-android
Sauvegarde
Merge branch 'master' of https://github.com/bsaleil/um2-android

Conflicts:
	Projet-android/res/values/strings.xml
	Projet-android/src/com/um2/android/CustomMapActivity.java
Merge branch 'master' of https://github.com/bsaleil/um2-android

Conflicts:
	Projet-android/src/com/um2/android/CustomMapActivity.java