Made little icons on the map to tell you which color corespondsto which label
Made all the neccesary slots and signals in reporting to communicate with others subsystems
YAY :)
       modified:   EOBC/resources/comsConfig.txt
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/facilityicon.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/DisplayMap/mapvectors.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
Merge branch 'master' of /home/4user1/achamney/Dropbox/project/source
Merge branch 'master' of /home/4user1/repwolfe/Dropbox/project/source
Added comments, fixed but in UpdateBeds.
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/GetData/getdatadisplaymapinterface.cpp
	modified:   EOBC/src/GetData/getdatadisplaymapinterface.h
	modified:   EOBC/src/GetData/getdatareportinginterface.h
Update Waiting List functionality finished, Facility can now return its entire patient list
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.h
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.h
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/Model/facility.cpp
	modified:   EOBC/src/Model/facility.h
Minor fix for fake report data, added function to Area's waiting list
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Model/area.h
made reports connect properly with getdata. scalable, and better over all
small map changes

	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportbars.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
	modified:   EOBC/src/Reporting/viewreportwindow.cpp
Recovering after repository corruption
All files JP worked on have been replaced with the files on his branch
	modified:   EOBC/src/Receive/ReceiveMessageControl.cpp
	modified:   EOBC/src/Receive/ReceiveMessageControl.h
	modified:   EOBC/src/Send/sendmessagecontrol.cpp
	new file:   EOBC/src/Storage/StorageWrite.cpp
	new file:   EOBC/src/Storage/StorageWrite.h
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/Storage/storageHandler.h
fix conveniace code loss
	modified:   EOBC/src/Common/convenience.cpp
	modified:   EOBC/src/Common/convenience.h
Added SendChangeDataInterface, prepping for sending changes accross network.
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	new file:   EOBC/src/Send/Changes.txt
	new file:   EOBC/src/Send/sendchangedatainterface.cpp
	new file:   EOBC/src/Send/sendchangedatainterface.h
	modified:   EOBC/src/main.cpp
Forgot to include Area.h in Facility.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/Model/facility.cpp
Fixed several bugs
Facil icons now know about the area they are in based on the model instead
of the collision code with the map (slightly better)

The reports can now select multiple facilities, although the requested
data does not change.

	modified:   EOBC/src/Common/convenience.cpp
	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/DisplayMap/maparea.h
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.cpp
	modified:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/report.cpp
	modified:   EOBC/src/Reporting/report.h
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
Converted all ChangeData controlers to take Patient* and Facility* instead of their keys...
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.h
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.h
	modified:   EOBC/src/ChangeData/View/movepatientform.cpp
	modified:   EOBC/src/ChangeData/View/movepatientform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatachangedatainterface.cpp
	modified:   EOBC/src/GetData/getdatachangedatainterface.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/Model/area.cpp
	modified:   EOBC/src/Send/sendchangedatainterface.cpp
	modified:   EOBC/src/Send/sendchangedatainterface.h
	modified:   EOBC/src/Send/sendmessagecontrol.cpp
	modified:   EOBC/src/Send/sendmessagecontrol.h
Send Move To Bed update
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
Hooked up ChannelIn with Receive
	modified:   channelin.cpp
	modified:   channelin.h
	new file:   communicationreceiveinterface.cpp
	new file:   communicationreceiveinterface.h
	modified:   communicationsendinterface.cpp
	modified:   communicationsendinterface.h
	modified:   ../../EOBC.pro
	modified:   ../ChangeData/changedatacontrol.cpp
	modified:   ../Receive/ReceiveMessageControl.cpp
	modified:   ../Receive/ReceiveMessageControl.h
	modified:   ../Send/sendmessagecontrol.cpp
	modified:   ../Send/sendmessagecontrol.h
	modified:   ../main.cpp
Made send and receive know about communication
Added Storage read
added getModel to storageHandler
	modified:   EOBC/EOBC.pro
	new file:   EOBC/src/Storage/StorageRead.cpp
	new file:   EOBC/src/Storage/StorageRead.h
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/Storage/storageHandler.h
Merge branch 'master' of /home/ubuntu/Dropbox/project/source

Conflicts:
	EOBC/EOBC.pro
Fixed XML Prsing (Thanks Robbie:)
	modified:   EOBC/src/Send/sendmessagecontrol.cpp
Made changedatacontrol safer and can now add up to 5000 beds to a facility
	modified:   EOBC/src/ChangeData/View/updatebedsform.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp