konflikte behoben
Merge remote-tracking branch 'origin/master'

Conflicts:
	Onlineshop/app/models/entities/Warenkorb.java