Merge remote-tracking branch 'origin/feature/prepare' into feature/prepare

Conflicts:
	Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.Designer.cs
	Proftaak Remote Healthcare/FietsClientV2/Forms/PatientForm.designer.cs
	Proftaak Remote
Healthcare/FietsClientV2/Resources/PatientForm.Designer.cs

Proftaak Remote Healthcare/FietsClientV2/CurrentData.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 namespace FietsClient
 {
     public class CurrentData
-    {
+    {//faggsd
         private string userID;
         public bool isDoctor { set; get; }
         private List<Session> testResult;