Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/entity/Parking_Lot.java