final upload
Merge remote-tracking branch 'origin/gal'

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