aa
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	WebRoot/WEB-INF/web.xml
	src/applicationContext.xml
dsds
Merge branch 'master' of https://github.com/handsomeTom/mblog
aaaa