Code changes for three failed attempts
Safety alarms and HVAC GUI changes
changes for email
Merge branch 'master' of
https://github.com/UTDAgileTeam3/CS6301SHASRepoTeam3-WebGUI.git

Conflicts:
	edu.utdallas.shas/WebContent/WEB-INF/database.properties