alle libs inkludiert die notwendig sind, inserten von Kontakten geht, Selecten funktioniert serverseitig
Select funktioniert, Client/Proxy ausgebaut
some GUI stuff
GUI
Merge remote-tracking branch 'origin/searchContacts'

Conflicts:
 SWE2_Client/src/gui/KontaktViewController.java
 SWE2_Client/src/gui/KontaktViewModel.java
 SWE2_Client/src/gui/MainController.java
 SWE2_Client/src/gui/MainControllerKontaktModel.java
 SWE2_Client/src/gui/MainControllerRechnungModel.java
 SWE2_Client/src/gui/RechViewController.java
 SWE2_Client/src/gui/RechZeileViewController.java
 SWE2_Client/src/gui/searchKontaktViewController.java
 SWE2_Client_R/bin/.gitignore
 SWE2_Client_R/src/controllers/KontaktViewController.java
 SWE2_Client_R/src/controllers/MainController.java
 SWE2_Client_R/src/controllers/RechViewController.java
 SWE2_Client_R/src/controllers/RechZeileViewController.java
 SWE2_Client_R/src/controllers/searchKontaktViewController.java
 SWE2_Client_R/src/gui/KontaktViewController.java
 SWE2_Client_R/src/gui/KontaktViewModel.java
 SWE2_Client_R/src/gui/MainController.java
 SWE2_Client_R/src/gui/MainControllerKontaktModel.java
 SWE2_Client_R/src/gui/MainControllerRechnungModel.java
 SWE2_Client_R/src/gui/RechViewController.java
 SWE2_Client_R/src/gui/RechZeileViewController.java
 SWE2_Client_R/src/gui/searchKontaktViewController.java
 SWE2_Client_R/src/models/KontaktViewModel.java
 SWE2_Client_R/src/models/MainControllerKontaktModel.java
 SWE2_Client_R/src/models/MainControllerRechnungModel.java
Just some few changes
Files updated, libs MISSING! :(((
lib added
Merge branch 'check'
Select Contact funktioniert
some gui stuff again...
Merge remote-tracking branch 'origin/searchContacts' into victor

Conflicts:
	SWE2_Client/src/gui/KontaktViewController.java
	SWE2_Client/src/gui/KontaktViewModel.java
	SWE2_Client/src/gui/MainController.java
	SWE2_Client/src/gui/MainControllerKontaktModel.java
	SWE2_Client/src/gui/MainControllerRechnungModel.java
	SWE2_Client/src/gui/RechViewController.java
	SWE2_Client/src/gui/RechZeileViewController.java
	SWE2_Client/src/gui/searchKontaktViewController.java
	SWE2_Client_R/bin/.gitignore
	SWE2_Client_R/src/controllers/KontaktViewController.java
	SWE2_Client_R/src/controllers/MainController.java
	SWE2_Client_R/src/controllers/RechViewController.java
	SWE2_Client_R/src/controllers/RechZeileViewController.java
	SWE2_Client_R/src/controllers/searchKontaktViewController.java
	SWE2_Client_R/src/gui/KontaktViewController.java
	SWE2_Client_R/src/gui/KontaktViewModel.java
	SWE2_Client_R/src/gui/MainController.java
	SWE2_Client_R/src/gui/MainControllerKontaktModel.java
	SWE2_Client_R/src/gui/MainControllerRechnungModel.java
	SWE2_Client_R/src/gui/RechViewController.java
	SWE2_Client_R/src/gui/RechZeileViewController.java
	SWE2_Client_R/src/gui/searchKontaktViewController.java
	SWE2_Client_R/src/models/KontaktViewModel.java
	SWE2_Client_R/src/models/MainControllerKontaktModel.java
	SWE2_Client_R/src/models/MainControllerRechnungModel.java
Merge branch 'victor'

Conflicts:
	SWE2_Client/bin/.gitignore
	SWE2_Client_R/bin/.gitignore