Update the domain in the layout template
Fix image urls
Merge branch 'develop'