Merge branch 'master' of github.com:skyjake/Doomsday-Engine
Conflicts:doomsday/apps/client/src/world/sectorcluster.cpp
Merge branch 'master' of github.com:skyjake/Doomsday-Engine
Conflicts:
doomsday/apps/client/src/world/sectorcluster.cpp