Closed #170
Merge branch 'master' of https://github.com/ushahidi/uchaguzi