Added CreateUserControl, I think it is implemented properly
	modified:   EOBC/EOBC.pro
	new file:   EOBC/src/ChangeData/Control/createusercontrol.cpp
	new file:   EOBC/src/ChangeData/Control/createusercontrol.h
	modified:   EOBC/src/ChangeData/View/createuserform.cpp
	modified:   EOBC/src/ChangeData/View/createuserform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/main.cpp
Merge branch 'master' of /home/4user1/repwolfe/Dropbox/project/source

Conflicts:
	EOBC/EOBC.pro
	EOBC/src/main.cpp
Introduced minor compiler error, fixed it. Added connection for CreateUserForm
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/main.cpp
Added UpdateBedsControl, now appears and works. Minor fixes in CreateUserControl.
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/Control/createusercontrol.h
	new file:   EOBC/src/ChangeData/Control/updatebedscontrol.cpp
	new file:   EOBC/src/ChangeData/Control/updatebedscontrol.h
	modified:   EOBC/src/ChangeData/View/createuserform.cpp
	modified:   EOBC/src/ChangeData/View/updatebedsform.cpp
	modified:   EOBC/src/ChangeData/View/updatebedsform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
	modified:   EOBC/src/main.cpp
Added UpdateWaitingListControl. Added convenince function to return CareType for a QString. Fixed typo in Patient.h.
	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.h
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatebedscontrol.h
	new file:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	new file:   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/Common/convenience.cpp
	modified:   EOBC/src/Common/convenience.h
	modified:   EOBC/src/Model/patient.cpp
	modified:   EOBC/src/Model/patient.h
	modified:   EOBC/src/Storage/storageHandler.cpp
Adding saving feature to storage
	modified:   src/Storage/storageHandler.cpp
	modified:   src/Storage/storageHandler.h
still implementing saving
	modified:   src/Storage/storageHandler.cpp
	modified:   src/Storage/storageHandler.h
Merge branch 'master' of /home/austin/Dropbox/project/source

Conflicts:
	EOBC/EOBC.pro

Added two forms, one for generation, one for selecting reports.
Connected the display map subsystem with reporting.

	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.h
	new file:   EOBC/src/ChangeData/Control/createusercontrol.cpp
	new file:   EOBC/src/ChangeData/Control/createusercontrol.h
	new file:   EOBC/src/ChangeData/Control/updatebedscontrol.cpp
	new file:   EOBC/src/ChangeData/Control/updatebedscontrol.h
	new file:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	new file:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.h
	modified:   EOBC/src/ChangeData/View/createuserform.cpp
	modified:   EOBC/src/ChangeData/View/createuserform.h
	modified:   EOBC/src/ChangeData/View/updatebedsform.cpp
	modified:   EOBC/src/ChangeData/View/updatebedsform.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/Common/convenience.cpp
	modified:   EOBC/src/Common/convenience.h
	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/displaymapcontrol.h
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	modified:   EOBC/src/GetData/getdatacontrol.cpp
	modified:   EOBC/src/GetData/getdatacontrol.h
	modified:   EOBC/src/Model/patient.cpp
	modified:   EOBC/src/Model/patient.h
	new file:   EOBC/src/Reporting/generatereportwindow.cpp
	new file:   EOBC/src/Reporting/generatereportwindow.h
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
	new file:   EOBC/src/Reporting/viewallreportswindow.cpp
	new file:   EOBC/src/Reporting/viewallreportswindow.h
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/main.cpp
Merge branch 'master' of /home/austin/Dropbox/project/source
Forgot display waiting lits form slot
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/ChangeData/changedatacontrol.h
Added new signals for updateWaitingList

	modified:   EOBC/src/DisplayMap/displaymapcontrol.cpp
	modified:   EOBC/src/DisplayMap/displaymapcontrol.h
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/main.cpp
Merge branch 'master' of /home/austin/Dropbox/project/source
Did all sorts of stuff.
Fixed a bug with facilityicons.
changed dot color.
added a bunch of classes to reporting.
a graph will now show if select is selected from showallreports

	modified:   EOBC/EOBC.pro
	modified:   EOBC/src/DisplayMap/facilityicon.cpp
	modified:   EOBC/src/DisplayMap/map.cpp
	modified:   EOBC/src/DisplayMap/map.h
	modified:   EOBC/src/DisplayMap/maparea.cpp
	new file:   EOBC/src/Reporting/report.cpp
	new file:   EOBC/src/Reporting/report.h
	new file:   EOBC/src/Reporting/reportbars.cpp
	new file:   EOBC/src/Reporting/reportbars.h
	modified:   EOBC/src/Reporting/reportingcontrol.cpp
	modified:   EOBC/src/Reporting/reportingcontrol.h
	modified:   EOBC/src/Reporting/viewallreportswindow.cpp
	modified:   EOBC/src/Reporting/viewallreportswindow.h
	new file:   EOBC/src/Reporting/viewreportwindow.cpp
	new file:   EOBC/src/Reporting/viewreportwindow.h
	modified:   EOBC/src/main.cpp
Converted MovePatientForm and UpdateWaitingListForm to using QTreeWidget which lets the patient list have columns. Added convenience function to check if a health card number is properly formatted
	modified:   EOBC/src/ChangeData/Control/movepatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	modified:   EOBC/src/ChangeData/View/movepatientform.cpp
	modified:   EOBC/src/ChangeData/View/movepatientform.h
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.cpp
	modified:   EOBC/src/ChangeData/View/updatewaitinglistform.h
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
	modified:   EOBC/src/Common/convenience.cpp
	modified:   EOBC/src/Common/convenience.h
Merge branch 'master' of /home/robbie/Dropbox/project/source
Removed errors I hate VI
	modified:   EOBC/src/Storage/storageHandler.cpp
removed more warnings
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/Storage/storageHandler.h
Now UpdateWaitingList is pretty much implemented.
	modified:   EOBC/src/ChangeData/Control/addpatientcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.cpp
	modified:   EOBC/src/ChangeData/Control/updatewaitinglistcontrol.h
	modified:   EOBC/src/ChangeData/View/addpatientform.cpp
	modified:   EOBC/src/ChangeData/View/addpatientform.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/Common/convenience.cpp
No longer displaying UpdateWaitingListForm at startup
	modified:   EOBC/src/ChangeData/changedatacontrol.cpp
added new get methods to storage handler
 	modified:   EOBC/resources/storage.xml
	modified:   EOBC/src/Storage/storageHandler.cpp
	modified:   EOBC/src/Storage/storageHandler.h