Just committing so I can pull
Merge branch 'master' of git@github.com:Astroware/FAMIS.git

Conflicts:
	FireAlertMobileInspectionSystem/AndroidManifest.xml
changed location or hub button