Update city to server

Signed-off-by: luislukas <luislukas@gmail.com>
Merge branch 'master' into ainhoa