Fix #252
Fix #239
Localization in grunt
Added Swahili
Localization migration complete
Merge branch 'dev'