Merge proposals dependent on lp:~abreu-alexandre/ubuntu-html5-theme/fix-docs-html5-new-structure

1. fix-docs-html5-new-structure
2. Dependent merge proposals