Merge branch 'master' of https://github.com/oqy/webapp-testproject.git

Conflicts:
	src/main/resources/com/minyisoft/webapp/testproject/persistence/UserMapper.xml
	src/main/resources/log4j.properties
	src/main/webapp/WEB-INF/spring/root-context.xml
Merge branch 'master' of https://github.com/oqy/webapp-testproject.git