Add timeout error string for #979 loading cities
Merge branch 'master' of git://github.com/ushahidi/Ushahidi-Localizations