添加图标
Commit
Merge remote-tracking branch 'origin/master'
commit
Commit
Commit
Commit
Commit
还原天气服务，增加ActionSheetPicker
Merge branch 'master' of http://localhost/git/JiaodongOnlineNews

Conflicts:
	JiaodongOnlineNews.xcodeproj/project.pbxproj