desktop merge
Merge branch 'master' of http://github.com/KFanPrecalcMan/FunkZombie

Conflicts:
	Source/Renderer2D/Renderer2D.cpp
	Source/playground.cpp
	playground.vcxproj
	playground.vcxproj.filters