update
Merge branch 'master' of https://github.com/kychill1986/mav

Conflicts:
	src/main/.DS_Store
	target/classes/com/yang/controller/JSONController.class
	target/classes/com/yang/controller/UserController.class
	target/classes/com/yang/jdbc/dao/JDBCUserDao.class
	target/classes/com/yang/service/UserService.class
	target/m2e-jee/web-resources/META-INF/maven/com.yang.mav/mav/pom.properties
	target/m2e-jee/web-resources/META-INF/maven/com.yang.mav/mav/pom.xml
	target/test-classes/com/yang/test/UserTest.class
update