modify pizzas and checkout
Merge branch 'master' of https://github.com/dave90/WebPizzaProject.git

Conflicts:
	WebPizza/WebContent/WEB-INF/jsp/css/style.css
	WebPizza/WebContent/index.jsp
	WebPizza/test/it/unical/mat/test/DB/TestDAOPizzaIngridientsOrder.java