Commit
Merge branch 'master' of http://192.168.10.3/git/JiaodongOnlineNews

Conflicts:
	JiaodongOnlineNews/Classes/Controllers/JDOViolationViewController.xib
	JiaodongOnlineNews/Classes/Views/JDOQuestionCell.m
Commit
调整设置和分享
Merge remote-tracking branch 'origin'
修改新闻头条左右滑动的逻辑，修改离线下载逻辑
Merge remote-tracking branch 'origin'
违章查询
Commit
Merge remote-tracking branch 'origin'
加按钮阴影
Commit
1、修改离线下载相关功能
2、修改天气界面显示时不关闭左侧面板
Merge remote-tracking branch 'origin'
违章推送
Merge branch 'master' of http://localhost/git/JiaodongOnlineNews

Conflicts:
	JiaodongOnlineNews/Classes/Controllers/JDOViolationViewController.m
修改主页头条滑动逻辑
Merge remote-tracking branch 'origin'
调整违章，话题导读图显示模式，百度推送切换为生产模式
Merge remote-tracking branch 'origin'