Merge remote-tracking branch 'origin/123' into wsq

Conflicts:
	Business/ParkingFeeModel.cs
	Web/Controllers/WebRequest_PropertyController.cs