minimal changes
Merge remote-tracking branch 'origin/testingLoop' into peda

Conflicts:
	GW01/src/at/jku/ce/ue/service/InquiryOrderPlattformServiceImpl.java