Fixed Bugs on Kiswahili version
Merge branch 'core-2.2-rc-1' of git://github.com/frontlinesms/frontlinesms2 into core-2.2-rc-1