more flexible for theming
Merge branch 'develop-2' of https://github.com/Zabatak/Ushahidi_Web into develop

Closes #945