Merge remote-tracking branch 'origin/development' into to_master_wotg

Conflicts:
	Libs/libs/libcurl_android.a
	Libs/libs/libeay32.lib
	Libs/libs/ssleay32.lib
	Projects/UnitTests/Classes/StringFormatTest.h
	Projects/UnitTests/UnitTestsVS2010.vcxproj
	Projects/UnitTests/UnitTestsVS2010.vcxproj.filters
	Projects/Win32Framework/Win32Framework.vcxproj
	Sources/Internal/Animation/AnimationManager.cpp
	Sources/Internal/DAVAVersion.h
	Sources/Internal/Platform/Qt/MacOS/CorePlatformMacOS.cpp
	Sources/Internal/Platform/Qt/Win32/WindowsSpecifics.h
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNIWebView.java
	Sources/Internal/Platform/TemplateAndroid/WebViewControl.cpp
	Sources/Internal/Platform/TemplateAndroid/WebViewControl.h
	Sources/Internal/Platform/TemplateWin32/CoreWin32PlatformBase.cpp
	Sources/Internal/Platform/TemplateWin32/CoreWin32PlatformBase.h
	Sources/Internal/Platform/TemplateWin32/WebViewControlWin32.cpp
	Sources/Internal/Platform/TemplateWin32/WebViewControlWin32.h
	Sources/Internal/Render/2D/TextBlock.cpp
	Sources/Internal/Render/2D/TextBlock.h
	Sources/Internal/Render/RenderOptions.h
	Sources/Internal/Render/Texture.cpp
	Sources/Internal/Scene3D/Systems/ParticleEffectSystem.cpp
	Sources/Internal/UI/UIControlSystem.cpp
	Tools/Bin/ResourcePacker
	Tools/Bin/ResourcePacker.exe
	Tools/ResourceEditor/Classes/CommandLine/SceneExporter/SceneExporter.cpp
	Tools/ResourceEditor/Classes/Qt/DockProperties/PropertyEditor.h
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyWidgets/FlagSelectorCombo.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyWidgets/FlagSelectorCombo.h
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters