Merge branch 'master' of https://github.com/dave90/WebPizzaProject.git

Conflicts:
	WebPizza/src/it/unical/mat/webPizza/controller/ChefController.java
Revert ""

This reverts commit fe1a0e753b2b7fc67ad2c8799b9ca4a68dc33ae5.

Conflicts:
	WebPizza/src/it/unical/mat/webPizza/controller/AccountController.java
	WebPizza/src/it/unical/mat/webPizza/controller/ShoppingCart.java