commit

Signed-off-by: sundirosun <sunz_wei@yahoo.com>
Merge branch 'master' of https://github.com/prayogo/ATSE

Conflicts:
	PizzaWeb/build/web/WEB-INF/classes/bean/User.class
	PizzaWeb/build/web/WEB-INF/classes/controller/Adapter.class
	PizzaWeb/build/web/WEB-INF/classes/servlet/DoRegister.class
	PizzaWeb/build/web/WEB-INF/web.xml
	PizzaWeb/build/web/register.jsp
	PizzaWeb/src/java/bean/User.java
	PizzaWeb/src/java/controller/Adapter.java
	PizzaWeb/src/java/servlet/DoRegister.java
	PizzaWeb/web/WEB-INF/web.xml