Merge branch 'master' of https://github.com/shenobie/banque_java_cnam

Conflicts:
	AndroCnam/bin/AndroCnam.apk
	AndroCnam/bin/classes.dex
	AndroCnam/bin/resources.ap_
Merge branch 'master' of https://github.com/shenobie/banque_java_cnam

Conflicts:
	AndroCnam/bin/AndroCnam.apk
	AndroCnam/bin/classes.dex
	AndroCnam/bin/resources.ap_
y
y