Moved the implementation of some methods from the header file into the CPP file so that it would not be defined twice in the CamGui project (that gets it both from the header file and from the link to the CAM.DLL file)
Resolved conflicts.  Only minor changes