LG
Merge branch 'master' of https://github.com/kaety/NFC.git

Conflicts:
	App/bin/classes.dex
	App/bin/resources.ap_
Merge branch 'master' of https://github.com/kaety/NFC.git