merge preperation
Merge branch 'master' of
https://github.com/KreMat/SWE2_Micro_ERP_Serverplugin.git

Conflicts:
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/ContactService.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/CreateOrUpdateContactCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/CreateOrUpdateInvoiceCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetCompaniesByNameCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetContactByIdCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetContactsByNameCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetContactsBySearchstringCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetInvoicesByContactIdCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/business/commands/GetInvoicesBySearchstringCommand.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/command/CreateOrUpdateContactCommandTest.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/domain/Contact.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/helper/DtoMapper.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/helper/DtoMapperTest.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/helper/TestHelper.class
	SWE2_Micro_ERP_Serverplugin/bin/at/technikum/wien/winterhalder/kreuzriegler/swe2/service/GetContactsBySearchstringTest.class