Merge branch 'master' into develop
Major layout changes (images in header etc)
Merge branch 'develop'