ajout des markers orange et blue
Merge remote-tracking branch 'origin/final' into final

Conflicts:
	build/dex/debug/classes.dex
	build/source/r/debug/com/mapapp/mapappweb/R.java
	local.properties
ajout des markers orange et blue
Merge remote-tracking branch 'origin/final' into final
ajout des markers orange et blue