Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/world/nestedcoladapterimp.cpp apps/opencs/view/render/cell.cpp apps/opencs/view/render/worldspacewidget.cpp