user location
Merge branch 'master' of git://github.com/unicefuganda/rapidsms-uganda-common