commit
Merge branch 'master' of https://github.com/uunchpgney/FleetChat

Conflicts:
	FleetChat/bin/R.txt
	FleetChat/res/layout/chat_activity2.xml
Merge branch 'master' of https://github.com/uunchpgney/FleetChat
nfc added (not finished yet, will be finished by 11/7)