Collision loads from ogre meshes but doorwaysbroke
Unsure what this is =/
Merge branches 'master', 'recoverybracnh' and 'master' of https://github.com/HATtrick-games/ICT312

Conflicts:
	source/Debug/ogregraphics.exe
	source/Debug/ogregraphics.exp
	source/Debug/ogregraphics.lib
	source/Debug/ogregraphics.pdb
	source/ogregraphics/CollisionObject.cpp
	source/ogregraphics/CollisionWorldSingleton.cpp
	source/ogregraphics/CollisionWorldSingleton.h
	source/ogregraphics/Debug/CL.read.1.tlog
	source/ogregraphics/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/CollisionObject.obj
	source/ogregraphics/Debug/CollisionWorldSingleton.obj
	source/ogregraphics/Debug/DebugDrawer.obj
	source/ogregraphics/Debug/FrameListener.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/GenericObject.obj
	source/ogregraphics/Debug/IObject.obj
	source/ogregraphics/Debug/IScene.obj
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/LinearMotion.obj
	source/ogregraphics/Debug/MapNode.obj
	source/ogregraphics/Debug/NodeContainerSingleton.obj
	source/ogregraphics/Debug/OgreBulletDraw.obj
	source/ogregraphics/Debug/OgreGraphics.obj
	source/ogregraphics/Debug/RigidBodyObject.obj
	source/ogregraphics/Debug/RotationalMotion.obj
	source/ogregraphics/Debug/SceneLoader.obj
	source/ogregraphics/Debug/SceneManager.obj
	source/ogregraphics/Debug/TemporaryPlayerObject.obj
	source/ogregraphics/Debug/TestObject.obj
	source/ogregraphics/Debug/TestScene.obj
	source/ogregraphics/Debug/Vector3.obj
	source/ogregraphics/Debug/WorldMap.obj
	source/ogregraphics/Debug/cl.command.1.tlog
	source/ogregraphics/Debug/link.command.1.tlog
	source/ogregraphics/Debug/link.read.1.tlog
	source/ogregraphics/Debug/link.write.1.tlog
	source/ogregraphics/Debug/micropather.obj
	source/ogregraphics/Debug/mt.command.1.tlog
	source/ogregraphics/Debug/mt.read.1.tlog
	source/ogregraphics/Debug/mt.write.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/rc.command.1.tlog
	source/ogregraphics/Debug/rc.read.1.tlog
	source/ogregraphics/Debug/rc.write.1.tlog
	source/ogregraphics/Debug/stdafx.obj
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb
	source/ogregraphics/Game.cpp
	source/ogregraphics/GenericObject.cpp
	source/ogregraphics/IObject.cpp
	source/ogregraphics/MapNode.cpp
	source/ogregraphics/MapNode.h
	source/ogregraphics/NodeContainerSingleton.cpp
	source/ogregraphics/NodeContainerSingleton.h
	source/ogregraphics/OgreBulletDraw.h
	source/ogregraphics/WorldMap.cpp
	source/ogregraphics/WorldMap.h
	source/ogregraphics/ogregraphics.vcxproj
	source/ogregraphics/ogregraphics.vcxproj.filters

yep
Merge branch 'master' of https://github.com/HATtrick-games/ICT312