introduced some hacks to make this version compatible with the new gcc version on cmsuptracker003
no major changes!
Merge branch 'master' of https://github.com/gauzinge/CbcTest

Conflicts:
	CbcDaq/GUIFrameDict.cxx
	ICCalib/GUIFrameDict.cxx
	settings/CMNConfigHole.txt