City and location list in map controller
Merge branch 'map' of github.com:unepwcmc/wukumurl into map