Merge branch 'dava/development'
[DF-2776] Distance font render, distance font generation tool
Fix Win32 project
Remove gdx tools
[DF-2776] fix kerning
[DF-2776] fix font hash string for DFFont
[DF-2776] Fix some mistakes in distance font drawing
[DF-2776] Fix offset scaling
[DF-2776] Fix reloading font texture after changing font size
[DF-2776] Update font in unit tests
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
[DF-2776] fix after merge
[DF-2776] using ShaderCache
Fix input after megre
[DF-2776] Fix distance font clone. Fix font redraw after font parameters modification
Merge branch 'dava/development'

Conflicts:
	Libs/build_openssl_curl_android.sh
	Libs/libs/libcrypto_android.a
	Libs/libs/libcurl_android.a
	Libs/libs/libssl_android.a
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/Classes/AlignTest.cpp
	Projects/UnitTests/Classes/GameCore.cpp
	Projects/UnitTests/Classes/RectSpriteTest.cpp
	Projects/UnitTests/TemplateProjectMacOS.xcodeproj/project.pbxproj
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.pbxproj
	Projects/UnitTests/UnitTestsVS2010.vcxproj.filters
	Sources/Internal/Animation/AnimationManager.cpp
	Sources/Internal/Base/AtomicAndroid.cpp
	Sources/Internal/Particles/ParticleForce.cpp
	Sources/Internal/Particles/ParticleRenderObject.cpp
	Sources/Internal/Render/2D/Sprite.cpp
	Sources/Internal/Render/2D/TextBlock.cpp
	Sources/Internal/Render/2D/TextBlock.h
	Sources/Internal/Render/Highlevel/Landscape.cpp
	Sources/Internal/Render/Highlevel/RenderBatchArray.cpp
	Sources/Internal/Render/Highlevel/RenderBatchArray.h
	Sources/Internal/Render/Highlevel/StaticOcclusion.cpp
	Sources/Internal/Render/Highlevel/StaticOcclusionRenderPass.cpp
	Sources/Internal/Render/Highlevel/StaticOcclusionRenderPass.h
	Sources/Internal/Render/ImageLoader.cpp
	Sources/Internal/Render/ImageLoader.h
	Sources/Internal/Render/LibDxtHelper.cpp
	Sources/Internal/Render/LibDxtHelper.h
	Sources/Internal/Render/LibPVRHelper.cpp
	Sources/Internal/Render/Material/NMaterial.cpp
	Sources/Internal/Render/Material/NMaterial.h
	Sources/Internal/Render/Material/RenderTechnique.cpp
	Sources/Internal/Render/MipmapReplacer.cpp
	Sources/Internal/Render/RenderManager.h
	Sources/Internal/Render/RenderManagerGL.cpp
	Sources/Internal/Render/Shader.cpp
	Sources/Internal/Render/Shader.h
	Sources/Internal/Render/ShaderCache.cpp
	Sources/Internal/Render/ShaderCache.h
	Sources/Internal/Render/Texture.cpp
	Sources/Internal/Render/Texture.h
	Sources/Internal/Scene3D/Components/ParticleEffectComponent.cpp
	Sources/Internal/Scene3D/Systems/ParticleEffectSystem.cpp
	Sources/Internal/Scene3D/Systems/QualitySettingsSystem.cpp
	Sources/Internal/Scene3D/Systems/QualitySettingsSystem.h
	Sources/Internal/UI/UIControl.cpp
	Sources/Internal/UI/UIControl.h
	Sources/Internal/UI/UIControlBackground.cpp
	Sources/Internal/UI/UIControlBackground.h
	Sources/Internal/UI/UIParticles.cpp
	Sources/Internal/UI/UIParticles.h
	Sources/Internal/UI/UIScrollView.cpp
	Sources/Internal/UI/UIScrollView.h
	Sources/Internal/UI/UIScrollViewContainer.cpp
	Sources/Internal/UI/UIStaticText.cpp
	Sources/Internal/UI/UITextField.cpp
	Sources/Internal/UI/UIWebView.cpp
	Sources/Internal/Utils/StringFormat.cpp
	Sources/Tools/TextureCompression/DXTConverter.cpp
	Sources/Tools/TexturePacker/TexturePacker.cpp
	Tools/Bin/ResourcePacker
	Tools/Bin/ResourcePacker.exe
	Tools/ResourceEditor/Classes/Commands2/CommandID.h
	Tools/ResourceEditor/Classes/Commands2/TilemaskEditorCommands.cpp
	Tools/ResourceEditor/Classes/Deprecated/SceneValidator.cpp
	Tools/ResourceEditor/Classes/Deprecated/SceneValidator.h
	Tools/ResourceEditor/Classes/ImageTools/ImageTools.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/EditorLODData.cpp
	Tools/ResourceEditor/Classes/Qt/DockProperties/PropertyEditor.cpp
	Tools/ResourceEditor/Classes/Qt/DockProperties/PropertyEditor.h
	Tools/ResourceEditor/Classes/Qt/DockSceneTree/SceneTreeModel.h
	Tools/ResourceEditor/Classes/Qt/Main/QtUtils.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.h
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.h
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialItem.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialModel.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialModel.h
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialTree.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialTree.h
	Tools/ResourceEditor/Classes/Qt/QualitySwitcher/QualitySwitcher.cpp
	Tools/ResourceEditor/Classes/Qt/QualitySwitcher/QualitySwitcher.h
	Tools/ResourceEditor/Classes/Qt/Scene/System/CustomColorsSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/DebugDrawSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/DebugDrawSystem.h
	Tools/ResourceEditor/Classes/Qt/Scene/System/EditorMaterialSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/EditorParticlesSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/SelectionSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/StructureSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Settings/SettingsManager.cpp
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureBrowser.cpp
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureBrowser.h
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureConvertor.cpp
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureConvertor.h
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureConvertorWork.h
	Tools/ResourceEditor/Classes/Qt/Tools/LandscapeDialog/LandscapeDialog.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyDataValidator/HeightmapValidator.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyDataValidator/PathValidator.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyEditor.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyEditor.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyModel.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyModel.h
	Tools/ResourceEditor/Classes/Qt/Tools/SelectPathWidget/SelectPathWidgetBase.cpp
	Tools/ResourceEditor/Data/Materials/Silhouette.material
	Tools/ResourceEditor/DataQt/QtIcons.qrc
	Tools/ResourceEditor/DataQt/mainwindow.ui
	Tools/ResourceEditor/DataQt/materialeditor.ui
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
	Tools/UIEditor/Classes/Commands/ReloadSpritesCommand.cpp
	Tools/UIEditor/Classes/Commands/ReloadSpritesCommand.h
	Tools/UIEditor/Classes/DefaultScreen.cpp
	Tools/UIEditor/Classes/DefaultScreen.h
	Tools/UIEditor/Classes/Metadata/UIButtonMetadata.cpp
	Tools/UIEditor/Classes/Metadata/UIStaticTextMetadata.cpp
	Tools/UIEditor/Classes/Metadata/UITextControlMetadata.cpp
	Tools/UIEditor/Classes/ScreenControl.cpp
	Tools/UIEditor/Classes/ScreenControl.h
	Tools/UIEditor/Classes/UI/Dialogs/editpreviewsettingsdialog.cpp
	Tools/UIEditor/Classes/UI/Dialogs/editpreviewsettingsdialog.h
	Tools/UIEditor/Classes/UI/PropertyGridWidgets/aggregatorpropertygridwidget.cpp
	Tools/UIEditor/Classes/UI/PropertyGridWidgets/platformpropertygridwidget.cpp
	Tools/UIEditor/Classes/UI/PropertyGridWidgets/screenpropertygridwidget.cpp
	Tools/UIEditor/Classes/UI/hierarchytreewidget.cpp
	Tools/UIEditor/UIEditor.pro
	Tools/UIEditor/UIEditor.vcxproj
	Tools/UIEditor/UIEditor.vcxproj.filters
	Tools/UIEditor/UIEditor.xcodeproj/project.pbxproj
[DF-2776] Fix after merge
[DF-3883] Fix memory leak
[DF-3885] Small refactor, replace dynamic_cast with static_cast
[DF-3886] Fix indentation