Commit
Commit
Merge remote-tracking branch 'origin/master'
Commit
Commit
非常偶发的情况下,反序列化得到的是NSArray而不是NSMutableArray,为防止错误,加强制转换
Merge remote-tracking branch 'origin'
Commit
Commit
Commit
Commit
增加已读未读显示
Merge remote-tracking branch 'origin'
增加新闻推送及设置
Merge branch 'master' of http://localhost/git/JiaodongOnlineNews

Conflicts:
	JiaodongOnlineNews/Classes/Views/JDONewsCategoryView.m