Merge branch 'origin/development'

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/Win32Framework/Win32Framework.vcxproj.filters
	Sources/Internal/Render/2D/TextBlock.cpp
	Sources/Internal/Render/2D/TextBlock.h
	Sources/Internal/UI/UIStaticText.cpp