Added string overrides
Merge branch 'master' of https://github.com/humanitarianresponse/hr_platform