commit for confliction
commit for folder structure adjustment to maven standard
Merge branch 'master' of ssh://git@github.com/karlchan-cn/Blog.git

Conflicts:
	target/test-classes/org/hibernate/tutorial/util/HibernateUtil.class
	target/test-classes/org/hibernate/tutorial/util/TestHibernate.class
	target/test-classes/test/cn/com/kc/blog/service/BlogEntityServiceTest.class
	target/test-classes/test/cn/com/kc/blog/service/BlogUserServiceTest.class
	target/test-classes/test/cn/com/kc/blog/service/BlogUserServiceTester.class
	target/test-classes/test/cn/com/kc/blog/service/BootTester.class
	target/test-classes/test/cn/com/kc/blog/service/ValidationTester.class