Fixing Tools Navigation, closes #6
Merge branch 'master' of https://github.com/ushahidi/uchaguzi