Signed-off-by: yanhan <yanhanxn2010@gmail.com>
Merge branch 'master' of https://github.com/yanhan569046480/regist_logon

Conflicts:
	.settings/.svn/all-wcprops
	.settings/.svn/entries
	.settings/.svn/text-base/.jsdtscope.svn-base
	.settings/.svn/text-base/org.eclipse.jdt.core.prefs.svn-base
	.settings/.svn/text-base/org.eclipse.wst.common.component.svn-base
	.settings/.svn/text-base/org.eclipse.wst.common.project.facet.core.xml.svn-base
	.svn/all-wcprops
	.svn/entries
	.svn/text-base/.classpath.svn-base
	.svn/text-base/.project.svn-base
	WebContent/.svn/all-wcprops
	WebContent/.svn/entries
	WebContent/META-INF/.svn/all-wcprops
	WebContent/META-INF/.svn/entries
	WebContent/META-INF/.svn/text-base/MANIFEST.MF.svn-base
	WebContent/WEB-INF/.svn/all-wcprops
	WebContent/WEB-INF/.svn/entries
	WebContent/WEB-INF/.svn/text-base/web.xml.svn-base
	WebContent/WEB-INF/jsp/.svn/all-wcprops
	WebContent/WEB-INF/jsp/.svn/entries
	WebContent/WEB-INF/jsp/.svn/text-base/empList.jsp.svn-base
	WebContent/WEB-INF/jsp/.svn/text-base/login_result.jsp.svn-base
	WebContent/WEB-INF/jsp/.svn/text-base/login_syn.jsp.svn-base
	WebContent/WEB-INF/jsp/.svn/text-base/regist_asyn.jsp.svn-base
	WebContent/WEB-INF/jsp/.svn/text-base/regist_result.jsp.svn-base
	WebContent/WEB-INF/jsp/.svn/text-base/regist_syn.jsp.svn-base
	WebContent/WEB-INF/lib/.svn/all-wcprops
	WebContent/WEB-INF/lib/.svn/entries
	WebContent/WEB-INF/lib/.svn/prop-base/dom4j-1.6.1.jar.svn-base
	WebContent/WEB-INF/lib/.svn/prop-base/gson-2.2.2.jar.svn-base
	WebContent/WEB-INF/lib/.svn/prop-base/jstl.jar.svn-base
	WebContent/WEB-INF/lib/.svn/prop-base/mysql-connector-java-5.1.8-bin.jar.svn-base
	WebContent/WEB-INF/lib/.svn/prop-base/ojdbc14.jar.svn-base
	WebContent/WEB-INF/lib/.svn/prop-base/standard.jar.svn-base
	build/.svn/all-wcprops
	build/.svn/entries
	build/classes/.svn/all-wcprops
	build/classes/.svn/entries
	src/.svn/all-wcprops
	src/.svn/entries
	src/.svn/text-base/beans.properties.svn-base
	src/.svn/text-base/database_config.properties.svn-base
	src/.svn/text-base/user_infos.properties.svn-base
	src/com/.svn/all-wcprops
	src/com/.svn/entries
	src/com/tarena/.svn/all-wcprops
	src/com/tarena/.svn/entries
	src/com/tarena/web/.svn/all-wcprops
	src/com/tarena/web/.svn/entries
	src/com/tarena/web/dao/.svn/all-wcprops
	src/com/tarena/web/dao/.svn/entries
	src/com/tarena/web/dao/.svn/text-base/UserDao.java.svn-base
	src/com/tarena/web/dao/impl/.svn/all-wcprops
	src/com/tarena/web/dao/impl/.svn/entries
	src/com/tarena/web/dao/impl/.svn/text-base/UserDaoMysqlImpl.java.svn-base
	src/com/tarena/web/dao/impl/.svn/text-base/UserDaoPropertiesImpl.java.svn-base
	src/com/tarena/web/dao/impl/.svn/text-base/UserDaoXMLImpl.java.svn-base
	src/com/tarena/web/dao/test/.svn/all-wcprops
	src/com/tarena/web/dao/test/.svn/entries
	src/com/tarena/web/dao/test/.svn/text-base/MysqlImplTest.java.svn-base
	src/com/tarena/web/domain/.svn/all-wcprops
	src/com/tarena/web/domain/.svn/entries
	src/com/tarena/web/domain/.svn/text-base/User.java.svn-base
	src/com/tarena/web/filter/.svn/all-wcprops
	src/com/tarena/web/filter/.svn/entries
	src/com/tarena/web/filter/.svn/text-base/EncodingFilter.java.svn-base
	src/com/tarena/web/service/.svn/all-wcprops
	src/com/tarena/web/service/.svn/entries
	src/com/tarena/web/service/.svn/text-base/UserService.java.svn-base
	src/com/tarena/web/service/impl/.svn/all-wcprops
	src/com/tarena/web/service/impl/.svn/entries
	src/com/tarena/web/service/impl/.svn/text-base/UserServiceDatabaseImpl.java.svn-base
	src/com/tarena/web/servlet/.svn/all-wcprops
	src/com/tarena/web/servlet/.svn/entries
	src/com/tarena/web/servlet/.svn/text-base/CoreServlet.java.svn-base
	src/com/tarena/web/util/.svn/all-wcprops
	src/com/tarena/web/util/.svn/entries
	src/com/tarena/web/util/.svn/text-base/Configs.java.svn-base
	src/com/tarena/web/util/.svn/text-base/DatabaseUtils.java.svn-base
3rd
Signed-off-by: yanhan <yanhanxn2010@gmail.com>