g
Merge branch 'master' of github.com:suntreestar/template_spring

Conflicts:
	.settings/.jsdtscope
	.settings/org.eclipse.core.resources.prefs
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.wst.common.component
	.settings/org.eclipse.wst.common.project.facet.core.xml
	bak/HomeController.java
	bak/spring-servlet_bak.xml
	bak/spring-servlet_bak20130130.xml
	bak/spring-test-service_bak20130131.xml
	src/main/java/com/templateSpring/domain/Person.java
	src/main/java/com/templateSpring/webService/MyServiceImpl.java
	src/main/java/com/templateSpring/webTest/common/MyDataSource.java
	src/main/java/com/templateSpring/webTest/common/MySessionFactory.java
	src/main/java/com/templateSpring/webTest/common/MyTxManager.java
	src/main/java/com/templateSpring/webTest/controller/IndexController.java
	src/main/java/com/templateSpring/webTest/dao/UserDAO.java
	src/main/java/com/templateSpring/webTest/dao/impl/UserDAOImpl.java
	src/main/java/com/templateSpring/webTest/domain/User.java
	src/main/java/com/templateSpring/webTest/service/UserService.java
	src/main/java/com/templateSpring/webTest/service/impl/UserServiceImpl.java
	src/main/resources/jdbc.properties
	src/main/resources/spring-test-dao.xml
	src/main/resources/spring-test-service.xml
	src/main/webapp/META-INF/MANIFEST.MF
	src/main/webapp/WEB-INF/spring-servlet.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/media/js/jqueryUI/js/cookie.jquery.js
	src/main/webapp/velocity/VM_global_library.vm
	src/main/webapp/velocity/advanced_index.vm
	src/main/webapp/velocity/index.vm
	src/main/webapp/velocity/query.vm
	src/main/webapp/velocity/save.vm
	src/main/webapp/velocity/test.vm
	src/main/webapp/velocity/user.vm
	src/test/java/com/templateSpring/Db4oTests.java
	src/test/java/com/templateSpring/RunMyService.java
	src/test/java/com/templateSpring/registerTests.java
	src/test/java/com/templateSpring/simpleTest.java
	src/test/java/com/templateSpring/webTest/common/PropertiesTests.java
	src/test/java/com/templateSpring/webTest/dao/UserDAOTests.java
	src/test/java/com/templateSpring/webTest/service/UserServiceTests.java
	target/classes/com/templateSpring/aop/ServiceAspect.class
	target/classes/com/templateSpring/domain/Person.class
	target/classes/com/templateSpring/service/AdminServiceImpl.class
	target/classes/com/templateSpring/webService/MyService.class
	target/classes/com/templateSpring/webService/MyServiceImpl.class
	target/classes/com/templateSpring/webTest/controller/IndexController.class
	target/classes/com/templateSpring/webTest/dao/UserDAO.class
	target/classes/com/templateSpring/webTest/dao/impl/UserDAOImpl.class
	target/classes/com/templateSpring/webTest/domain/User.class
	target/classes/jdbc.properties
	target/classes/spring-test-service.xml
	target/m2e-wtp/web-resources/META-INF/maven/com/templateSpring/pom.properties
	target/m2e-wtp/web-resources/META-INF/maven/com/templateSpring/pom.xml
	target/test-classes/com/templateSpring/Db4oTests$1.class
	target/test-classes/com/templateSpring/Db4oTests.class
	target/test-classes/com/templateSpring/RunMyService.class
	target/test-classes/com/templateSpring/registerTests.class
	target/test-classes/com/templateSpring/simpleTest.class