..
Merge remote-tracking branch 'origin/master'

Conflicts:
	Debug/PixelShader.cso
	Debug/VertexShader.cso
	Preview/Preview.cpp
	Preview/WinMain.cpp