城市天气获取修改功能
Merge branch 'my' into official

Conflicts:
	android/WisdomCity/src/com/softstone/wisdomcity/fragments/WisdomCityHomeFragment.java