listview
Merge branch 'map'

Conflicts:
	LivrExpress/src/main/AndroidManifest.xml
	LivrExpress/src/main/res/values/strings.xml
Fiche bon de livraison
Merge remote-tracking branch 'origin/master'

Conflicts:
	LivrExpress/src/main/res/values/strings.xml