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

Conflicts:
	src/mblog/action/AddMBlogAction.java
	src/mblog/action/ViewMBlogAction.java
	src/mblog/service/impl/MblogServiceImpl.java
	src/struts.xml

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