fix merge: GLUtils.hpp in GLViewerDisplay.cpp and remove yade/ includes