lite update
asdaf
Merge branch 'Mathias-branch' of https://github.com/hyzor/GameProject into Mathias-branch

Conflicts:
	GameProject/GameProject/Common/Direct3D.cpp
	GameProject/GameProject/GUI.cpp
	GameProject/GameProject/GUI.h
	GameProject/GameProject/main.cpp