SPLIT part 6, CData common, ed fix, ShapeData.h, WaterRTT*, out includes
Merge branch 'master' of github.com:stuntrally/stuntrally

Conflicts:
	source/ogre/common/CData.h