Merge branch 'origin/development'

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/android/jni/Application.mk
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Projects/iPhoneFramework/Framework.xcodeproj/project.pbxproj
	Sources/Internal/Base/BaseTypes.h
	Sources/Internal/Math/Matrix4.h
	Sources/Internal/Particles/ParticleLayer.cpp
	Sources/Internal/Particles/ParticleLayer3D.cpp
	Sources/Internal/Particles/ParticleLayer3D.h
	Sources/Internal/Platform/TemplateAndroid/AndroidCrashReport.cpp
	Sources/Internal/Platform/TemplateAndroid/AndroidCrashReport.h
	Sources/Internal/Platform/TemplateAndroid/ExternC/AndroidLayer.cpp
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNIActivity.java
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNICrashReporter.java
	Sources/Internal/Platform/TemplateAndroid/Java/com/dava/framework/JNIDeviceInfo.java
	Sources/Internal/Platform/TemplateAndroid/JniExtensions.cpp
	Sources/Internal/Platform/TemplateiOS/WebViewControliOS.h
	Sources/Internal/Platform/TemplateiOS/WebViewControliOS.mm
	Sources/Internal/Render/Highlevel/CullingSystem.cpp
	Sources/Internal/Render/Highlevel/Landscape.cpp
	Sources/Internal/Render/Highlevel/Landscape.h
	Sources/Internal/Render/Highlevel/Mesh.h
	Sources/Internal/Render/Highlevel/ParticleLayerBatch.cpp
	Sources/Internal/Render/Highlevel/RenderBatch.cpp
	Sources/Internal/Render/Highlevel/RenderSystem.cpp
	Sources/Internal/Render/Highlevel/SkyboxRenderObject.cpp
	Sources/Internal/Render/Material.cpp
	Sources/Internal/Render/Material/NMaterial.h
	Sources/Internal/Scene3D/Components/LodComponent.cpp
	Sources/Internal/Scene3D/Components/SwitchComponent.h
	Sources/Internal/Scene3D/Entity.cpp
	Sources/Internal/UI/IWebViewControl.h
	Sources/Internal/UI/UIScrollView.cpp
	Sources/Internal/UI/UIScrollView.h
	Sources/Internal/UI/UIScrollViewContainer.cpp
	Sources/Internal/UI/UIScrollViewContainer.h
	Sources/Internal/UI/UITextFieldAndroid.cpp
	Sources/Internal/UI/UIWebView.cpp
	Sources/Internal/UI/UIWebView.h
	Tools/ResourceEditor/Classes/Commands2/CommandID.h
	Tools/ResourceEditor/Classes/Qt/DockHeightmapEditor/HeightmapEditorPropertiesView.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/DistanceSlider.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/DistanceSlider.h
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/LODEditor.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/LODEditor.h
	Tools/ResourceEditor/Classes/Qt/DockParticleEditor/EmitterLayerWidget.cpp
	Tools/ResourceEditor/Classes/Qt/DockParticleEditor/EmitterLayerWidget.h
	Tools/ResourceEditor/Classes/Qt/DockSceneInfo/SceneInfo.cpp
	Tools/ResourceEditor/Classes/Qt/DockSceneTree/SceneTreeItem.cpp
	Tools/ResourceEditor/Classes/Qt/DockTilemaskEditor/TilemaskEditorPropertiesView.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.h
	Tools/ResourceEditor/Classes/Qt/Scene/SceneEditor2.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/SceneEditor2.h
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.h
	Tools/ResourceEditor/Classes/Qt/Scene/System/CameraSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/RulerToolSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/System/StructureSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Settings/SettingsStateDialog.h
	Tools/ResourceEditor/Classes/Qt/SliderWidget/SliderWidget.h
	Tools/ResourceEditor/Classes/Qt/TextureBrowser/TextureProperties.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData/QtPropertyDataDavaVariant.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData/QtPropertyDataInspColl.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData/QtPropertyDataInspMember.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData/QtPropertyDataIntrospection.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyData/QtPropertyDataMetaObject.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtPropertyEditor.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtProperyData/QtPropertyDataIntrospection.h
	Tools/ResourceEditor/Classes/Qt/Tools/QtPropertyEditor/QtProperyData/QtPropertyDataMetaObject.h
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/GeneralSettingsEditor.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/GeneralSettingsEditor.h
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/SettingsDialogQt.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/SettingsDialogQt.h
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/SystemsSettingsEditor.cpp
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/SystemsSettingsEditor.h
	Tools/ResourceEditor/Classes/StringConstants.h
	Tools/ResourceEditor/DataQt/heightmapEditorProperties.ui
	Tools/ResourceEditor/DataQt/mainwindow.ui
	Tools/ResourceEditor/DataQt/tilemaskEditorProperties.ui
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
[DF-29] specular map for landscape