Merge cgogn:~untereiner/CGoGN
Conflicts: SCHNApps/Plugins/renderTopoSurface/forms/renderTopoSurface.ui SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurface.cpp SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurfaceDockTab.cpp
Conflicts: SCHNApps/Plugins/renderTopoSurface/forms/renderTopoSurface.ui SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurface.cpp SCHNApps/Plugins/renderTopoSurface/src/renderTopoSurfaceDockTab.cpp