Check in so Git will stop being such a git
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing

Conflicts:
	ALT/ControlLogic/HI/CameraControl.cpp
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Merge branch 'testing' of https://github.com/UofA-CaPSLOC-team/CaPSLOC-Project into testing
Binary with Camera stuff is now buildable.