observer
Merge branch 'master' of https://github.com/mmnguyen/shop.git

Conflicts:
	shop/src/main/java/de/shop/bestellverwaltung/service/BestellungObserver.java