commit de merge
Merge branch 'master' of https://github.com/bigoud/e-cave
une interface sans les fonctionnalités read/write
Merge branch 'master' of https://github.com/bigoud/e-cave

Conflicts:
	nfcPhoneGap/bin/nfcPhoneGap.apk
	nfcPhoneGap/bin/resources.ap_