Change image size
Merge branch 'develop'