merge conflict
completed the add edit delete of lot, no validation
Integrate master in mihai branch
Merge remote-tracking branch 'github/alex' into mihai

Conflicts:
	ParkingSpotGIT/ParkingSpot/src/parkingspot/jdo/servlet/AddLotServlet.java
	ParkingSpotGIT/ParkingSpot/src/parkingspot/jdo/servlet/DeleteLotServlet.java
	ParkingSpotGIT/ParkingSpot/src/parkingspot/jdo/servlet/UpdateLotServlet.java
Merge remote-tracking branch 'github/mihai'