Changes to Graphics done.
This was scary! :D
Revert "This was scary! :D"

This reverts commit 655607b595a50c9c510683ea404e470ad0895f35.
Small clean in Graphics.
Change includes in Client.
Merge remote-tracking branch 'origin/master' into compilation_speedup

Conflicts:
	Graphics/Source/Graphics.h