again
Merge branch 'master' of github.com:fabien-fac/IAWS

Conflicts:
	client/TisseoVelib/bin/TisseoVelib.apk
	client/TisseoVelib/bin/classes.dex
	client/TisseoVelib/bin/classes/org/iaws/R$string.class
	client/TisseoVelib/bin/classes/org/iaws/R$style.class
	client/TisseoVelib/bin/classes/org/iaws/adapter/LigneAdapter.class
	client/TisseoVelib/bin/classes/org/iaws/fragment/OptionsFragment.class
	client/TisseoVelib/bin/resources.ap_
reglage horaire prochain passage