different image handling + changes to modal markup
Merge branch 'modal-and-image-change'
Merge branch 'master' into stable