-for gal
Merge remote-tracking branch 'origin/master' into gal

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