Moved disposing in resource manager, which is now an engine module
Merge remote-tracking branch 'origin/master'