Resolved merge conflict
Resolved merge conflicts
Fixed issues with image upload
Merge branch 'US1727_images_rest' into develop