meer cycletest
Merge remote-tracking branch 'origin/master'

Conflicts:
	MediCare/MediCare.Client/ClientGui.cs