Commit Local
Merge branch 'master' of https://github.com/MehdiNS/Wisigoth.git

Conflicts:
	assets/grenoble.xml
	src/com/project/map/MyItemizedOverlay.java
	src/com/project/map/MyMapActivity.java
Merge branch 'master' of https://github.com/MehdiNS/Wisigoth.git

Conflicts:
	src/com/project/map/MyMapActivity.java
Commit pour pull
Merge branch 'master' of https://github.com/MehdiNS/Wisigoth.git

Conflicts:
	AndroidManifest.xml
	assets/grenoble.xml
	src/com/project/map/MyMapActivity.java
Merge branch 'master' of https://github.com/MehdiNS/Wisigoth.git

Conflicts:
	src/com/project/map/MyMapActivity.java