Merge branch 'master' into develop
Try out proper html5 doctype and meta
Merge branch 'develop'