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/action/AddCommentAction.class
	WebRoot/WEB-INF/classes/mblog/action/AddMBlogAction.class
	WebRoot/WEB-INF/classes/mblog/action/FindUserByNickAction.class
	WebRoot/WEB-INF/classes/mblog/action/LoginAction.class
	WebRoot/WEB-INF/classes/mblog/action/RegisterAction.class
	WebRoot/WEB-INF/classes/mblog/service/MblogService.class
	WebRoot/WEB-INF/classes/mblog/service/impl/MblogServiceImpl.class
	WebRoot/WEB-INF/classes/mblog/service/impl/UserServiceImpl.class

Signed-off-by: Xiaokai Ma <10302010013@fudan.edu.cn>