[DF-4311] Making DLC run on latest Downloader sources
Revert "[DF-185] Reverted maps versioning"

This reverts commit 537b8af478005094bec075a9f02e84a2e1ede046.

Conflicts:
	Projects/Win32Framework/Win32Framework.vcxproj
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Sources/Internal/Scene3D/SceneFileV2.cpp
[DF-4295] Mirrored grass in shader
Merge branch 'development' into mirrorland
[DF-4070] Fixed asserts
[DF-4070] Fixed open file assert
[DF-4399] Fixed deadlock and crash at unwanted status change notification. Unit Test uses DLC test.
[DF-4070 Fixed warnings]
[DF-4070 Fixed warnings]
Merge branch 'dava/development'

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/Classes/DeviceInfoTest.cpp
	Projects/UnitTests/Classes/DeviceInfoTest.h
	Projects/UnitTests/Classes/GameCore.cpp
	Projects/UnitTests/TemplateProjectMacOS.xcodeproj/project.pbxproj
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.pbxproj
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.xcworkspace/xcshareddata/TemplateProjectiPhone.xccheckout
	Projects/UnitTests/UnitTestsVS2010.vcxproj.filters
	Projects/Win32Framework/Win32Framework.vcxproj
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Projects/iPhoneFramework/Framework.xcodeproj/project.pbxproj
	Sources/Internal/Platform/DeviceInfo.cpp
	Sources/Internal/Platform/DeviceInfo.h
	Sources/Internal/Platform/TemplateAndroid/DeviceInfoAndroid.cpp
	Sources/Internal/Platform/TemplateAndroid/DeviceInfoAndroid.h
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNIActivity.java
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNIDeviceInfo.java
	Sources/Internal/Platform/TemplateWin32/DeviceInfoWin32.cpp
	Sources/Internal/Render/2D/GraphicsFont.h
	Sources/Internal/Render/Highlevel/StaticOcclusion.cpp
	Sources/Internal/Scene3D/Systems/StaticOcclusionSystem.cpp
	Sources/Internal/Scene3D/Systems/StaticOcclusionSystem.h
	Sources/Internal/UI/UIControl.cpp
	Sources/Internal/UI/UIStaticText.cpp
	Tools/ResourceEditor/Classes/Qt/Settings/SettingsManager.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyEditor.h
	Tools/UIEditor/Classes/UI/hierarchytreewidget.cpp
	Tools/UIEditor/UIEditor.vcxproj
	Tools/UIEditor/UIEditor.vcxproj.filters
Fix after merge
Merge branch 'development' into feature-new-lighting-landscape

Conflicts:
	Sources/Internal/Render/Material/NMaterial.cpp
Merge branch 'development' into development_ground_fog

Conflicts:
	Sources/Internal/Render/Highlevel/RenderBatch.cpp
	Sources/Internal/Render/Highlevel/RenderSystem.cpp
	Sources/Internal/Render/Material/NMaterial.cpp
	Sources/Internal/Scene3D/Scene.cpp
	Tools/ResourceEditor/Classes/Qt/MaterialEditor/MaterialEditor.cpp
	Tools/ResourceEditor/Data/Materials/Shaders/Default/materials.fsh
	Tools/ResourceEditor/Data/Materials/Shaders/Default/materials.vsh
[DF-185] Some little fixes after merge
[DF-2880] - fixes from other branch are merged to correct one.
Merge remote-tracking branch 'origin/development' into DF-2880_UISlider_refactoring
[DF-3756] Preparation to merge to fog branch
Merge branch 'feature-new-lighting-landscape' into development_ground_fog

Conflicts:
	Sources/Internal/Render/Material/NMaterial.cpp
	Sources/Internal/Render/Shader.cpp
	Tools/ResourceEditor/Data/Materials/Shaders/Landscape/tilemask.fsh
	Tools/ResourceEditor/Data/Materials/Shaders/Landscape/tilemask.vsh
Merge branch 'feature-new-lighting-landscape' into development_ground_fog

Conflicts:
	Sources/Internal/Render/Material/NMaterial.cpp
[DF-4571] big refactor of YamlNode.