Merge branch 'hotfix/image-links'
typo's. Typo's everywhere
Merge branch 'hotfix/content2' into develop