test parserProchain arret
xMerge branch 'master' of github.com:fabien-fac/IAWS

Conflicts:
	client/TisseoVelib/bin/TisseoVelib.apk
	client/TisseoVelib/bin/classes.dex
	client/TisseoVelib/bin/resources.ap_