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

Conflicts:
	.classpath
	META-INF/MANIFEST.MF
	WebRoot/WEB-INF/classes/applicationContext.xml
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/web.xml
	src/applicationContext.xml
	src/hibernate.cfg.xml