Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>
Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>
Merge branch 'master' of https://github.com/handsomeTom/mblog.git

Conflicts:
	WebRoot/WEB-INF/classes/mblog/Bean/Comment.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Impress.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Impression.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Mark.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Mblog.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Tag.hbm.xml
	WebRoot/WEB-INF/classes/mblog/Bean/User.hbm.xml
	WebRoot/WEB-INF/lib/activation.jar