Merge branch 'master' of github.com:buren/enduro into java1_6

Merged to java1_6 test branch.6
Merge branch 'markdown_to_html_complete_dom' of github.com:buren/enduro into java1_6

Merged to java1_6 test branch