updated to v2.0
Merge branch 'cybox_to_html2'