[DF-2992] fixes for mac project
[DF-3053] fix for issue
Merge branch 'origin/feature-integration-new-materials'

Conflicts:
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj