Merge remote-tracking branch 'origin/master'

Conflicts:
	PROJECT.suo
	PROJECT/obj/x86/Debug/PROJECT.pdb
	PROJECT/obj/x86/Debug/addPatient.baml
	PROJECT/obj/x86/Debug/addPatient.g.cs