TESTING
Basic GUI no implementation yet
//update
includes nfc code.....not fully tested yet
Merge branch 'master' of https://github.com/NelleSmo/Quorigo.git

Conflicts:
	Quori/bin/Quori.apk
	Quori/bin/classes.dex
	Quori/bin/resources.ap_