update with s3 amazons image
Merge branch 'attachmentIssue'