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

Conflicts:
	FleetChat/bin/FleetChat.apk
	FleetChat/bin/R.txt
	FleetChat/bin/classes.dex
	FleetChat/bin/resources.ap_