updating the image item to the new API
setting up
Merge remote-tracking branch 'origin/image-support'
fix merge
integrating resource manager into the image
better names
Merge branch 'master' into engine-changes
Merge branch 'image-support' into engine-changes