-fix check out\in
Merge remote-tracking branch 'origin/ofer'

Conflicts:
	vcproject/src/controler/CheckOutController.java
	vcproject/src/gui/CheckOut_Panel.java