Initial commit on this branch
Added all extra equipment details
Merge branch 'Equipment-Deatils-Fix' into new-master

Conflicts:

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$3.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$4.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$5.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$6.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$7.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$8.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
$DataReceiver.class

FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity
.class
	FireAlertScanner/bin/resources.ap_
	FireAlertScanner/src/se3350y/aleph/firealertscanner/ScanActivity.java