Basic maps as images
Merge branch 'image-field' into dev
Image bugfix with non-square maps