un commit
Merge branch 'master' of
https://github.com/gabriellamer/CovoiturageMobile

Conflicts:
	bin/CovoiturageMobile.apk
	bin/classes.dex
	bin/resources.ap_
Merge branch 'master' of https://github.com/gabriellamer/CovoiturageMobile