html5 update
Merge pull request #2030 from Jonadabe/patch-7

[*] FO : html5 doctype and some minor updates