aaaa
add database6.22
aa
lib
aa
Merge branch 'master' of https://github.com/handsomeTom/mblog

Conflicts:
	.classpath
	.gitignore
	.settings/.jsdtscope
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.wst.common.project.facet.core.xml
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/classes/mblog/Bean/Comment.class
	WebRoot/WEB-INF/classes/mblog/Bean/Impress.class
	WebRoot/WEB-INF/classes/mblog/Bean/Impression.class
	WebRoot/WEB-INF/classes/mblog/Bean/Mark.class
	WebRoot/WEB-INF/classes/mblog/Bean/Mblog.class
	WebRoot/WEB-INF/classes/mblog/Bean/Tag.class
	WebRoot/WEB-INF/classes/mblog/Bean/User.class
	WebRoot/WEB-INF/classes/mblog/Dao/CommentDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/ImpressDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/ImpressionDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/MarkDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/MblogDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/TagDAO.class
	WebRoot/WEB-INF/classes/mblog/Dao/UserDAO.class
	src/hibernate.cfg.xml