Merge pull request #1 from CodeForAfricaLabs/develop

New design
Merge branch 'develop'
Until server switch
Merge branch 'master' into develop