Merge pull request #113 from oxylusengine/asset_manager_refactor