fix merge
integrating resource manager into the image
better names
Merge branch 'master' into engine-changes
Merge branch 'image-support' into engine-changes
master
Merge branch 'engine-changes'
removed master