stuff
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameState.cpp
Merge branch 'master' of https://github.com/qwexsugare/Spelprojekt

Conflicts:
	GameClient/GameState.cpp
	GraphicsEngine/DeferredSamplerEffectFile.cpp
	GraphicsEngine/DeferredSamplerEffectFile.h
	GraphicsEngine/GraphicsHandler.h
	GraphicsEngine/Model.cpp
	GraphicsEngine/World.cpp