Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/entity/Parking_Lot.java
Merge remote-tracking branch 'origin/master' into Ofer
-fix MySqlConnection (Double "stilling" from Float)
-fix VcpInfo - ParkingLot problem