Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
Various fixes as per feedback comments.