Merge branch 'staging'
Change image size in Attachments Model
Merge branch 'new-site-integration' into staging