Don't know what i did :-)
Merge branch 'master' of https://github.com/Thagor/shop-rest

Conflicts:
	src/main/java/de/is/project/shop/gui/ServiceRequestController.java
	src/main/java/de/is/project/shop/gui/UIHelper.java