暂无改动
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git
关注/取消关注问题
Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git

Conflicts:
	WebRoot/QA_Answer.jsp
	WebRoot/WEB-INF/classes/com/ISharing/Action/BlogAction.class
	WebRoot/WEB-INF/classes/com/ISharing/ORM/User.hbm.xml
	WebRoot/WEB-INF/classes/struts.xml
	src/com/ISharing/ORM/User.hbm.xml
	src/struts.xml

Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ISharing.git

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

Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>