Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	sourcefiles/GXPEngine/bin/Debug/GXPEngine.pdb
	sourcefiles/GXPEngine/obj/x86/Debug/GXPEngine.pdb