Merge proposals dependent on lp://staging/~ubuntu-manual-website/ubuntu-manual-website/design

1. design
2. Dependent merge proposals