a
Merge branch 'dev' of https://github.com/Originalutter/PizzaShop.git
into dev

Conflicts:
	PizzaShop/WebContent/WEB-INF/classes/pizza/PizzaServlet.class