Merge branch 'AP-35' into AP-181

Conflicts:
	client/src/Game.cpp
	client/src/ICoreSystem.h
	client/src/Platform_Windows/CoreSystemWindows.cpp
	client/src/Platform_Windows/CoreSystemWindows.h
	client/src/Platform_Windows/GraphicsWindows.cpp