增加umeng统计功能以及如果没有及时定位用户所在的城市信息的bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
Merge branch 'master' of https://github.com/zane001/HappyWeather

Conflicts:
	README.md