Merge proposals dependent on lp://staging/~abreu-alexandre/ubuntu-html5-theme/add-content-margins

1. add-content-margins
2. Dependent merge proposals