trying to fix stash issues
fixing stash issues
fixing stash issues
fixing stash issues
Merge remote-tracking branch 'origin/master' into UIWorkSD

Conflicts:
	Client/CheckInClient/ViewModel/MainViewModel.cs
	Client/CheckInClient/ViewModel/PilotViewModel.cs