Testing edit menu
fixed merge
Merge branch 'UIWorkSD' of https://github.com/Nedlinin/SuperKidsDay into UIWorkSD

Conflicts:
	Client/CheckInClient/ViewModel/MainViewModel.cs