Fix incorrect viewModel casing in Patient.ViewModel
Fix merge conflicts
Merge branch 'master' of https://github.com/Cartman380/ClearanceToolbar

Conflicts:
	Html/RelayHealth/ClearanceToolbarWrapper/MainWindow.xaml
	Html/RelayHealth/ClearanceToolbarWrapper/obj/Debug/MainWindow.g.i.cs
	Html/RelayHealth/RelayHealth.v11.suo
Check in toolbar changes that includes a working Search By Name Combobox.  The web portion is currently using Knockout, and we are going to move towards using angular.