minor updates of functionality
Merge branch 'master' of https://github.com/codeforpakistan/ActiveCitizenship