fix W3C validation errors
Merge remote-tracking branch 'template/master'