image upload fixing
Merge branch 'develop' into iPad_version