Merge branch 'ImageFacade' into 'Milestone-2'

Created ImageFacade, added image-related fixes

See merge request !43