conflicts
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Fix messages admin - filtering by message service #28
Reverting messages admin customisations to make it sane again
Add missing translations and fix message buttons
Fix conflicts
Closes #47