made account management screen with add, delete, and modify buttons, 
but there are some errors that need ironing out
Merge branch 'master' of git@github.com:Astroware/FAMIS.git

Conflicts:
	FireAlertMobileInspectionSystem/res/layout/activity_client_screen.xml
	FireAlertMobileInspectionSystem/src/com/astroware/famis/ClientScreen.java
home button + account management button + dog
tried to fix problems
Merge branch 'master' of git@github.com:Astroware/FAMIS.git

Conflicts:
	FireAlertMobileInspectionSystem/res/layout/activity_account_management_screenv3.xml
	FireAlertMobileInspectionSystem/res/layout/activity_extinguisher_form.xml
	FireAlertMobileInspectionSystem/src/com/astroware/famis/EquipmentScreen.java
	FireAlertMobileInspectionSystem/src/com/astroware/famis/ExtinguisherForm.java
	FireAlertMobileInspectionSystem/src/com/astroware/famis/LoginScreen.java
	FireAlertMobileInspectionSystem/src/controlClasses/XMLParse.java
Merge branch 'master' of git@github.com:Astroware/FAMIS.git

Conflicts:
	FireAlertMobileInspectionSystem/res/layout/activity_equipment_screen.xml
took an extra back button