Merge origin/master

Conflicts:
	src/main/java/de/hsos/kbse/pizza4me/manager/AccountManager.java
	src/main/java/de/hsos/kbse/pizza4me/manager/OrderManager.java
	src/main/webapp/bestellung.xhtml
Merge origin/master

Conflicts:
	src/main/java/de/hsos/kbse/pizza4me/manager/AccountManager.java