date
Merge branch 'master' of https://github.com/AlCaponi/Bestellsystem

Conflicts:
	src/ch/hslu/dmg/Main/BestellBusiness.java
Merge branch 'master' of https://github.com/AlCaponi/Bestellsystem

Conflicts:
	src/ch/hslu/dmg/Main/BestellBusiness.java