[DF-2382] fix xcode proj, small improvements
Merge branch 'DAVA/feature-integration-new-materials'
[DF-2382] refactoring of settingsManager
[DF-3090] Fix landscape resizing via landscape dialog
[DF-2355] - Memory Leaks fixes in UIEditor.
Merge branch 'origin/development'

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Projects/iPhoneFramework/Framework.xcodeproj/project.pbxproj
	Sources/Internal/Render/Highlevel/Landscape.cpp
	Sources/Internal/UI/UIControlBackground.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/LODEditor.cpp
	Tools/ResourceEditor/Classes/Qt/DockSceneInfo/SceneInfo.cpp
	Tools/ResourceEditor/Classes/Qt/DockSceneInfo/SceneInfo.h
	Tools/ResourceEditor/Classes/Qt/Scene/System/CustomColorsSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/HeightmapEditorSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/TilemaskEditorSystem.cpp
	Tools/ResourceEditor/Classes/SceneEditor/ColorPicker.cpp
	Tools/ResourceEditor/Classes/SceneEditor/FogControl.cpp
	Tools/ResourceEditor/Classes/SceneEditor/HintManager.cpp
	Tools/ResourceEditor/Classes/SceneEditor/LandscapeEditorCustomColors.cpp
	Tools/ResourceEditor/Classes/SceneEditor/LandscapeEditorHeightmap.cpp
	Tools/ResourceEditor/Classes/SceneEditor/LandscapeTool.cpp
	Tools/ResourceEditor/Classes/SceneEditor/MaterialEditor.cpp
	Tools/ResourceEditor/Classes/SceneEditor/TextureTrianglesDialog.cpp
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
[DF-2822] fix review issues
[DF-2822] fix review issues
Merge branch 'DAVA/feature-integration-new-materials'
[DF-3090] Fix applying fog settings
[DF-2988] add new item to menu scene
[DF-3093] Fix undo\redo for setting tile color
[DF-2992] key generation for sorting by material changed
Merge branch 'origin/feature-integration-new-materials'
Merge branch 'feature-integration-new-materials' of github.com:dava/dava.framework into feature-integration-new-materials
[DF-3080] Fixed crash on convertation to dds/pvr
Merge branch 'feature-integration-new-materials' of https://github.com/dava/dava.framework into feature-integration-new-materials
DF-2765 test for build machine
[DF-29] Fixed parsing of shader. By binaryzebra
DF-2765 test for build machine