Merge branch 'master' into fix-editor-incompatibilities
working on audio/resource-manager issues, removed double-request to importCustomData
Merge pull request #123 from Animatron/fix-editor-incompatibilities

Several fixes for Resource Manager