Merge pull request #16 from CacheCake/master

合并
修复主页登陆后不显示新闻
修复私信分页标签无效的bug
增加新的分页标签
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git

Conflicts:
	src/com/tjxjh/action/MerchantAction.java
把私信的名字和头像加上到私信详细信息的链接
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git
Merge pull request #15 from wayne0332/master

给你足够的数据弄分页