常规代码开发130702下午16:34

andy
Merge branch 'master' of https://github.com/fanghaibo/Iweather

Conflicts:
	src/com/mm/iweather/tools/Tools.java