Merge branch 'develop' of https://github.com/praekelt/oneplus into feature/issue-7-contact-about-pages
Merge remote-tracking branch 'origin/feature/issue-7-contact-about-pages' into feature/issue-7-contact-about-pages