Moved all resources to new folder.
Merge remote-tracking branch 'origin/master' into resource_manager_with_allocator
Obj extra data not working as intended