Merge remote-tracking branch 'DAVA/development' into feature-new-materials

Conflicts:
	Tools/ResourceEditor/Classes/Qt/DockProperties/PropertyEditor.cpp
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters