Modif
Merge branch 'android' of https://github.com/Ormazz/kercart2-2013 into android

Conflicts:
	KercarAndroid/src/com/kercar/ChoixPointArrive.java