Additional mapping

Additional mapping handles more elements for  CNXML->HTML5 and HTML5->CNXML.