add "set city" and "update weather": 100%
conflict fix
Merge branch 'master' of https://github.com/lovelease/helloandroid.git