fix problem with running on non-NFC device
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/org/uta/nfcorienteering/activity/BaseNfcActivity.java