Merge https://github.com/prayogo/ATSE

Conflicts:
	PizzaWeb/web/header.jsp
Merge branch 'master' of https://github.com/prayogo/ATSE

Conflicts:
	PizzaWeb/web/header.jsp
Merge branch 'master' of https://github.com/prayogo/ATSE

Conflicts:
	PizzaWeb/web/header.jsp
Merge branch 'master' of https://github.com/prayogo/ATSE
Merge branch 'master' of https://github.com/prayogo/ATSE
commit cart.jsp
Merge branch 'master' of https://github.com/prayogo/ATSE

Conflicts:
	PizzaWeb/src/java/controller/Adapter.java
	PizzaWeb/web/WEB-INF/web.xml