Merge remote-tracking branch 'origin/master'

Conflicts:
	SmartParking/Checkin.xaml.cs
	SmartParking/VIew/History.xaml.cs
fsd
sdsdsdsfsf