Changes from Mpho
Merge branch 'master' of https://github.com/mtswenij/smartcitizens