增加收藏对文章热度的修改

Signed-off-by: ZhongLing <kevin6132919@163.com>
Merge branch 'master' of git@github.com:zhengjiabin/ISharing.git

Conflicts:
	WebRoot/WEB-INF/classes/com/ISharing/Action/BlogAction.class