Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts: doomsday/engine/src/resource/models.cpp
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
Conflicts:
doomsday/engine/src/resource/models.cpp