Just a couple of qstring.h to QString include changes to avoid the compilation warning.
Merged CamManager.h
Merge branch 'cam-py' of https://github.com/andrewjrobinson/FreeCAD_sf_master into origin/cam-py
Merge branch 'nightly' into origin/cam-py
Merge branch 'nightly' of https://github.com/DavidNicholls/FreeCAD_sf_master into nightly
Fixed error in the code that rounds floating point numbers for inclusion in the Python scripts (i.e. toolpaths).