Sofas in
Merge branch '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/Debug/CL.write.1.tlog
	source/ogregraphics/Debug/CollisionWorldSingleton.obj
	source/ogregraphics/Debug/Game.obj
	source/ogregraphics/Debug/ITBuildingScene.obj
	source/ogregraphics/Debug/link.write.1.tlog
	source/ogregraphics/Debug/ogregraphics.write.1.tlog
	source/ogregraphics/Debug/vc100.idb
	source/ogregraphics/Debug/vc100.pdb