Merge branch 'origin/development'

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/Classes/UIListTest.cpp
	Projects/UnitTests/Classes/UIScrollViewTest.cpp
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Sources/Internal/Base/BaseTypes.h
	Sources/Internal/Math/Vector.h
	Sources/Internal/Particles/ParticleLayer3D.cpp
	Sources/Internal/Particles/ParticleLayer3D.h
	Sources/Internal/Render/Highlevel/CullingSystem.cpp
	Sources/Internal/Render/Highlevel/CullingSystem.h
	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/UIList.cpp
	Sources/Internal/UI/UIList.h
	Sources/Internal/UI/UITextFieldAndroid.cpp
	Tools/ResourceEditor/Classes/Commands2/CommandID.h
	Tools/ResourceEditor/Classes/Commands2/InspMemberModifyCommand.h
	Tools/ResourceEditor/Classes/Commands2/InspMemebrModifyCommand.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/DistanceSlider.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/DistanceSlider.h
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/EditorLODData.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/LODEditor.cpp
	Tools/ResourceEditor/Classes/Qt/DockLODEditor/LODEditor.h
	Tools/ResourceEditor/Classes/Qt/DockSceneInfo/SceneInfo.cpp
	Tools/ResourceEditor/Classes/Qt/DockSceneTree/SceneTreeItem.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.h
	Tools/ResourceEditor/Classes/Qt/Scene/System/StructureSystem.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/QtProperyData/QtPropertyDataIntoCollection.h
	Tools/ResourceEditor/Classes/Qt/Tools/SettingsDialog/GeneralSettingsEditor.h
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters