Jamie | added html features link
Jamie | fixed merge conflicts