fixing conflicts
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
conflict fix
Merge branch 'master' of https://github.com/ushahidi/uchaguzi
Header Nav -> links functional