ajout de maps
ajout de maps
ajout de maps
Avancee recherche sur carte
Retrait imports inutiles
manifest modified
gMap changed
Resolution de conflits
Bug fixing
nettoyage de code
finitions sur map
ajout itinéraire
Merge branch 'develop'

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
	AndroidManifest.xml
	project.properties
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/epsi/VignPerzMal/activities/DisplayStoreActivity.java
	src/com/epsi/VignPerzMal/activities/MainActivity.java
	src/com/epsi/VignPerzMal/database/StoreDAL.java