first test
改了
改了
Initial commit
改名字
修改Huati与HuatiList的实体类
改变AppContext更新逻辑，变为只有网就更新
将列表更新机制改为依赖网络类型而变
Merge branch 'master' into huati

Conflicts:
	src/net/oschina/app/bean/HuatiList.java
v2
wyzxandroid-1.1
合并前
合并前
Merge branch 'master' of https://github.com/wuyourikan/rikan.git

Conflicts:
	.gitignore
	README.md
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.classpath
	.gitignore
	.project
	AndroidManifest.xml
	README.md
	proguard.cfg
	res/drawable/welcome.png
	res/layout/active_listitem.xml
	res/layout/frame_huati.xml
	res/layout/frame_news.xml
	res/layout/huati_listitem.xml
	res/layout/image_dialog.xml
	res/layout/image_zoom_dialog.xml
	res/layout/main.xml
	res/layout/main_footer.xml
	res/layout/main_header.xml
	res/layout/message_detail_listitem.xml
	res/layout/message_listitem.xml
	res/layout/news_detail.xml
	res/layout/news_detail_footer.xml
	res/layout/news_listitem.xml
	res/layout/search.xml
	res/layout/search_listitem.xml
	res/layout/tweet_listitem.xml
	res/layout/update_progress.xml
	res/layout/user_favorite.xml
	res/values/arrays.xml
	res/values/messages.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/preferences.xml
	src/com/weibo/net/Weibo.java
	src/greendroid/widget/QuickActionWidget.java
	src/net/oschina/app/AppConfig.java
	src/net/oschina/app/AppContext.java
	src/net/oschina/app/AppException.java
	src/net/oschina/app/AppManager.java
	src/net/oschina/app/AppStart.java
	src/net/oschina/app/adapter/GridViewFaceAdapter.java
	src/net/oschina/app/adapter/ListViewCommentAdapter.java
	src/net/oschina/app/adapter/ListViewHuatiAdapter.java
	src/net/oschina/app/adapter/ListViewNewsAdapter.java
	src/net/oschina/app/api/ApiClient.java
	src/net/oschina/app/bean/Comment.java
	src/net/oschina/app/bean/CommentList.java
	src/net/oschina/app/bean/Entity.java
	src/net/oschina/app/bean/FavoriteList.java
	src/net/oschina/app/bean/Huati.java
	src/net/oschina/app/bean/HuatiList.java
	src/net/oschina/app/bean/News.java
	src/net/oschina/app/bean/NewsList.java
	src/net/oschina/app/bean/Notice.java
	src/net/oschina/app/bean/Result.java
	src/net/oschina/app/bean/URLs.java
	src/net/oschina/app/bean/UserInformation.java
	src/net/oschina/app/common/BitmapManager.java
	src/net/oschina/app/common/FileUtils.java
	src/net/oschina/app/common/ImageUtils.java
	src/net/oschina/app/common/QQWeiboHelper.java
	src/net/oschina/app/common/SinaWeiboHelper.java
	src/net/oschina/app/common/StringUtils.java
	src/net/oschina/app/common/UIHelper.java
	src/net/oschina/app/common/UpdateManager.java
	src/net/oschina/app/ui/About.java
	src/net/oschina/app/ui/CommentPub.java
	src/net/oschina/app/ui/FeedBack.java
	src/net/oschina/app/ui/ImageDialog.java
	src/net/oschina/app/ui/ImageZoomDialog.java
	src/net/oschina/app/ui/LoginDialog.java
	src/net/oschina/app/ui/Main.java
	src/net/oschina/app/ui/NewsDetail.java
	src/net/oschina/app/ui/Search.java
	src/net/oschina/app/ui/Setting.java
	src/net/oschina/app/ui/UserCenter.java
	src/net/oschina/app/ui/UserFavorite.java
	src/net/oschina/app/ui/UserFriend.java
	src/net/oschina/app/ui/UserInfo.java
	src/net/oschina/app/widget/LinkView.java
	src/net/oschina/app/widget/PullToRefreshListView.java
完成合并，但有许多BUG
专题 界面层 Main/Bean/ui