Making sure code is how we like it
Merge branch '923-fixes' of https://github.com/ditorelo/Ushahidi_Web into 923-fixes