Merge proposals dependent on lp://staging/~toykeeper/ubuntuone-testing/referrals-section-in-faq

1. referrals-section-in-faq
2. Dependent merge proposals