fix images
Merge branch 'develop' into staging

staginfg testing for images