Merge remote-tracking branch 'origin/fix-static-occlusion' into DF-2776_Distance_field_font

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/Classes/GameCore.cpp
	Projects/UnitTests/TemplateProjectMacOS.xcodeproj/project.pbxproj
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.pbxproj
	Projects/UnitTests/UnitTestsVS2010.vcxproj.filters
	Projects/Win32Framework/Win32Framework.vcxproj
	Sources/Internal/Render/2D/GraphicsFont.h
	Sources/Internal/UI/UIStaticText.cpp
	Tools/UIEditor/UIEditor.vcxproj.filters
fix after merge