Changes to camera control so it builds
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-project into testing

Conflicts:
	ALT/ControlLogic/HI/CameraControl.cpp