Merge proposals dependent on lp://staging/~app-review-board/ubuntu-app-review-board/unity-lens-graphicdesign-oneiric

1. unity-lens-graphicdesign-oneiric
2. Dependent merge proposals