布局测试
Merge branch 'master' of https://github.com/fanghaibo/Iweather

Conflicts:
	src/com/mm/iweather/ui/activity/MainActivity.java