Merge branch 'origin/development-qa'

Conflicts:
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Sources/Internal/Base/BaseTypes.h
	Sources/Internal/Particles/ParticleLayer3D.cpp
	Sources/Internal/Particles/ParticleLayer3D.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/RenderBatchArray.h
	Sources/Internal/Render/Highlevel/RenderSystem.cpp
	Sources/Internal/Render/Material/NMaterial.h
	Sources/Internal/Scene3D/Components/SwitchComponent.h
	Sources/Internal/Scene3D/Entity.cpp
	Sources/Internal/Scene3D/Systems/SkyboxSystem.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.cpp
	Tools/ResourceEditor/Classes/Qt/Main/mainwindow.h
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.cpp
	Tools/ResourceEditor/Classes/Qt/Scene/SceneHelper.h