Annoying 2nd Commit
Deleted ModemTester.java

Un-needed class tester.
Merge branch 'master' into Peter
Packaged Master

Packaged Master for Distribution 3/13/2013
Added Paging and Server Initialization

There is an issue with the config file properties.  Get a null pointer
exception.
Fixed issue with settings.cfg --> configProps.cfg

Still quits and causes the error afterwards
Syncing commit
Fixed NullPointer && Fixed "How do I configure?" Question
Forgot to Save :(. Second commit
Final Update to 1.0.3b
Updated with PagingSystem

Incorporating PagingSystem Module
Compressed for Distributiion of 1.0.4b
Sync
Adding PagingSystem
Minor Bug Fixes per customer

I added a verbose function by running via command line with the -v
command.  Logs are stored in the base directory of the client/server
for now.  A better logging implementation for console/server
interactions will be handled by Peter.
Bug Changes and Debugging Fixes

Added a debug mode via a switch of -v.  For now it is always set to on.

Added first time alarm modifications.
Removed JTree until that can be sorted better.
Changes SCADASite to be able to access more data.
lol this is stupid
Added Google Maps Library and Netbeans Project
Merge branch 'master' of https://github.com/AvogadroSG1/SCADASystem

Conflicts:
	.DS_Store
	Paging
System/build/classes/alert/AlertMonitoringSystem$AlertMonitoringPanel.cl
ass
	Paging System/build/classes/dummy/DummyAlertServer.class
	Paging System/build/classes/employee/EmployeeHandler.class
	Paging
System/build/classes/employee/gui/EmployeePanel$EmployeeDayPanel$Employe
eEditDialog.class
	Paging
System/build/classes/employee/gui/EmployeePanel$EmployeeDayPanel$Employe
eList.class
	Paging
System/build/classes/employee/gui/EmployeePanel$EmployeeDayPanel.class
	Paging
System/build/classes/pagingsystem/PagingSystem$PagingSystemPanel.class
	Paging System/nbproject/build-impl.xml
	Paging System/nbproject/genfiles.properties
	Paging System/nbproject/private/private.properties
	Paging System/nbproject/private/private.xml
	Paging System/src/employee/EmployeeHandler.java
	WashCoScadaServer/build/classes/log/LoggingSystem.class
	WashCoScadaServer/build/classes/modem/PageWithModem$1.class

WashCoScadaServer/build/classes/modem/PageWithModem$JobAckCodeGenerator$
AckCode.class

WashCoScadaServer/build/classes/modem/PageWithModem$JobAckCodeGenerator.
class
	WashCoScadaServer/build/classes/modem/PageWithModem$PagingPlug.class
	WashCoScadaServer/build/classes/modem/PageWithModem.class
	WashCoScadaServer/build/classes/washcoscadaserver/SCADAServer.class
	WashCoScadaServer/src/modem/PageWithModem.java
	WashCoScadaServer/src/washcoscadaserver/SCADAServer.java
Sync