Changed the TCP dialog to an AlertDialog for compatibility.
Merge branch 'TCPStuff' into new-master

Conflicts:
	FireAlertScanner/bin/FireAlertScanner.apk
	FireAlertScanner/bin/classes.dex

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/EmergencyLig
htYesNoElement$1.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/EmergencyLig
htYesNoElement.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExpandableLi
stAdapter.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/Extinguisher
PassFailElement$1.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/Extinguisher
PassFailElement.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/FireHoseCabi
netGoodPoorElement.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/FireHoseCabi
netYesNoElement$1.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/FireHoseCabi
netYesNoElement.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/MainDataEntr
y$1.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/MainDataEntr
y$2.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/MainDataEntr
y.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/R$id.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/R$layout.cla
ss

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/R$menu.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/R$string.cla
ss

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/R$style.clas
s
	FireAlertScanner/bin/resources.ap_
	FireAlertScanner/gen/se3350y/aleph/firealertscanner/R.java