Fixed the merge stuff
Merge branch 'new-master' of https://github.com/Aleph-Naught/SE3350Y into new-master

Conflicts:
	FireAlertScanner/bin/FireAlertScanner.apk
	FireAlertScanner/bin/classes.dex
	FireAlertScanner/bin/classes/com/dataInput/samplescanner/ScanCodeDemo.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/DOM.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExpandableListAdapter$passFailViewHolder.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExpandableListAdapter.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExtinguisherPassFailElement$1.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExtinguisherPassFailElement$passFailViewHolder.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ExtinguisherPassFailElement.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity$1.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity$2.class
	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$DataReceiver.class
	FireAlertScanner/bin/classes/se3350y/aleph/firealertscanner/ScanActivity.class
	FireAlertScanner/bin/resources.ap_
	FireAlertScanner/res/layout/activity_scan.xml
	FireAlertScanner/res/values/strings.xml
	FireAlertScanner/src/se3350y/aleph/firealertscanner/ExpandableListAdapter.java
	FireAlertScanner/src/se3350y/aleph/firealertscanner/ExtinguisherPassFailElement.java
	FireAlertScanner/src/se3350y/aleph/firealertscanner/ScanActivity.java
Fixed other merge stuff