Add: amd, comment, embed, html5page
Merge remote-tracking branch 'origin/master'