blah

blah
Merge branch 'master' into Peter

Conflicts:
	WashCoScadaMonitor/src/WashCoSCADAMonitor/WashCoSCADAMonitor.java
d

d
d

d
up

up
Added Controls to Server

Lots of server control additions. Also modified PageServer some.
Changed access control

Just changed one method from public to private
.

.
Merge branch 'Peter'

Conflicts:
	Paging System/nbproject/private/private.properties
	PagingSystem/src/gui/JSwitchBox.java

WashCoScadaServer/build/classes/modem/PageWithModem$PageAndModemPanel.cl
ass
	WashCoScadaServer/build/classes/modem/PageWithModem.class
	WashCoScadaServer/build/classes/washcoscadaserver/SCADARunner.class

WashCoScadaServer/build/classes/washcoscadaserver/SCADAServer$CheckAlarm
Task.class
	WashCoScadaServer/nbproject/private/private.properties