Merge branch 'hotfix/grunt'
W3C validation cleanup
Merge branch 'hotfix/html-cleanup' into develop