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

Conflicts:
	src/applicationContext.xml

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