diff --git a/.gitignore b/.gitignore
index 1ba48376d..f79fd95f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -248,3 +248,4 @@
 /ReportImp/VkmAachenSbd/obj/Debug
 /ReportImp/VkmAachenSbd/obj/Release
 /ReportImp/HilfeDaheim2/obj/Release
+/Model/Changes_2017_06_01.txt
diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index b1d810e0a..6fcd41bef 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -467,10 +467,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\SchulbegleitenderDienstCustomer.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="View\Master\SchulbegleitenderDienstMasterView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -884,8 +880,6 @@
     <Compile Include="View\Navigation\CustomerTeamNavigationView.xaml.cs">
       <DependentUpon>CustomerTeamNavigationView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\SchulbegleitenderDienstCustomer.xaml.cs">
-      <DependentUpon>SchulbegleitenderDienstCustomer.xaml</DependentUpon>    </Compile>
     <Compile Include="View\Master\SchulbegleitenderDienstMasterView.xaml.cs">
       <DependentUpon>SchulbegleitenderDienstMasterView.xaml</DependentUpon>
     </Compile>
@@ -1353,6 +1347,12 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
+    </Page>
+	<Page Include="View\SchulbegleitenderDienst.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="View\Report\AnnualReport\AnnualReportChartControl.xaml">
       <SubType>Designer</SubType>
@@ -1767,6 +1767,9 @@
     </Compile>
     <Compile Include="View\PercentageDisplay.xaml.cs">
       <DependentUpon>PercentageDisplay.xaml</DependentUpon>
+    </Compile>
+	<Compile Include="View\SchulbegleitenderDienst.xaml.cs">
+      <DependentUpon>SchulbegleitenderDienst.xaml</DependentUpon>
     </Compile>
     <Compile Include="View\Report\AnnualReport\AnnualReportChartControl.xaml.cs">
       <DependentUpon>AnnualReportChartControl.xaml</DependentUpon>
diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml
index ed5b00164..a8142e274 100644
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
@@ -354,7 +354,8 @@
                                 </Button.RenderTransform>
                             </localView:ImageButton>
 
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View"
+							<!-- r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View" -->
+                            <localView:ImageButton Visibility="Collapsed"
                                                    Click="button_CustomerTeam_Click"
                                                    x:Name="button_CustomerTeam"
                                                    Style="{StaticResource NavBarButton}"
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index 14ca74e82..18a72a65e 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -602,7 +602,8 @@
 				</Button>
 				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Arbeitswoche anzeigen"
 							Click="ButtonWorkWeekView_Click">
-					<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />
+					<!--<Image Source="/BeWoPlaner;component/Ressources/Icons/Calendar5Day24.png" />-->
+					<Image Source="../../Ressources/Icons/Calendar5Day24.png" />
 				</Button>
 				<Button Style="{x:Null}" Margin="1" Height="24" Width="24" ToolTip="Volle Woche anzeigen"
 							Click="ButtonWeekView_Click">
@@ -968,7 +969,7 @@
 				</CheckBox>
 			</StackPanel>
 			<ToggleButton Grid.Column="1" Style="{StaticResource VerticalExpanderLookAlikeToggleBotton}" Width="23" Height="23" Margin="3" Click="LeftExpanderClick" x:Name="LeftExpanderButton" />
-			<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black"
+			<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black" FormCustomizationUsingMVVMLocal="False"
 								GroupType="None" VerticalAlignment="Stretch"
 								EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
 								EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index be882c2df..1d65836f5 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -1010,16 +1010,16 @@ namespace BeWo.Scheduler.View
 
             }
 
-            if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderInZeiterfassungUebernehmen))
-            {
-                var menuitem = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && ((BarButtonItemLink)f).Item.Name.Contains("ZeiterfassungButtonItem"));
+            //if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderInZeiterfassungUebernehmen))
+            //{
+            //    var menuitem = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && ((BarButtonItemLink)f).Item.Name.Contains("ZeiterfassungButtonItem"));
 
-                if (menuitem != null)
-                {
-                    e.Menu.ItemLinks.Remove(menuitem);
-                }
+            //    if (menuitem != null)
+            //    {
+            //        e.Menu.ItemLinks.Remove(menuitem);
+            //    }
 
-            }
+            //}
 
             var ZusageUntermenue = e.Menu.ItemLinks.FirstOrDefault(f=>f.GetType() == typeof(BarSubItemLink) && ((BarSubItemLink) f).Item.Name.Equals("TeilnahmeMenue"));
 
diff --git a/BeWo/Scheduler/View/RequestAnswerView.xaml.cs b/BeWo/Scheduler/View/RequestAnswerView.xaml.cs
index e9a7fc4bb..65ad28011 100644
--- a/BeWo/Scheduler/View/RequestAnswerView.xaml.cs
+++ b/BeWo/Scheduler/View/RequestAnswerView.xaml.cs
@@ -206,9 +206,16 @@ namespace BeWo.Scheduler.View
 			SelektierterTermin = OTListView.SelectedItem as IBeWoAppointment;
             if (selektierterTermin != null && selektierterTermin.Start < DateTime.Now && selektierterTermin.End < DateTime.Now)
             {
-                ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).IsPC_CheckedTs = DateTime.Now;
-                ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).ParticipationAnswer = ParticipationAnswer.Verstrichen;
-                ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value).IsPChanged = false;
+	            var emp2app = ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId) ??
+	                          ((List<Employee2SchedulerAppointmentDC>) SelektierterTermin.CustomFields["EmployeeList"]).Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value);
+
+	            if (emp2app.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
+	            {
+					emp2app.ParticipationAnswer = ParticipationAnswer.Verstrichen;
+				}
+
+				emp2app.IsPC_CheckedTs = DateTime.Now;
+				emp2app.IsPChanged = false;
 
                 ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { ((SchedulerAppointmentVM)SelektierterTermin).DataContract }), UpdateView);
 
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
index 0c24ae278..0f554a52f 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Globalization;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -22,7 +21,6 @@ using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 
 using DevExpress.Xpf.Editors;
-using DevExpress.Xpf.Scheduler.Drawing;
 using DevExpress.Xpf.Scheduler.UI;
 using DevExpress.XtraScheduler;
 using SchedulerControl = DevExpress.Xpf.Scheduler.SchedulerControl;
@@ -341,7 +339,6 @@ namespace BeWo.Scheduler.View
 			DeleteAppointment();
 		}
 
-
 	    private void Button_CreatZeiterfassung_Click(object sender, RoutedEventArgs e)
 	    {
             var employ = SelectedMitarbeiter.Items;
diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
index fe61c13b0..558e79dee 100644
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
@@ -51,8 +51,10 @@ namespace BeWo.Scheduler.ViewModel
 				mAppointmentList.AddingNew += mAppointmentList_AddingNew;
 
 				foreach (var item in VMList)
+				{
 					mAppointmentList.Add(item);
-				
+				}
+
 				return mAppointmentList;
 			}
 		}
@@ -61,23 +63,23 @@ namespace BeWo.Scheduler.ViewModel
 		private readonly List<CompactEmployeeDC> mAllEmployees;
 		private readonly Dictionary<ValueListEntryDC, List<ResourceDC>> mCategories2Resources;
 
-		static void mAppointmentList_AddingNew(object sender, AddingNewEventArgs e)
+		private static void mAppointmentList_AddingNew(object sender, AddingNewEventArgs e)
 		{
 			var dc = new SchedulerAppointmentDC
 			{
 				EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
 				CustomerList = new List<CompactCustomerDC>(),
 				ResourceList = new List<ResourceDC>(),
-				//Originator   = ServiceFacade.DoEmployeeServiceSync(),
 				Status       = 0
 			};
 			
 			var neu = new SchedulerAppointmentVM(dc);
+
 			e.NewObject = neu;
 		}
 
-        private Dictionary<Guid, Dictionary<String, Dictionary<String, Object>>> changedOccurencyCustomFields;
-        public Dictionary<Guid, Dictionary<String, Dictionary<String, Object>>> ChangedOccurencyCustomFields { get; private set; }
+        private Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> changedOccurencyCustomFields;
+        public Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> ChangedOccurencyCustomFields { get; private set; }
 
 		public List<CompactCustomerDC> AllCustomers
 		{
@@ -95,7 +97,7 @@ namespace BeWo.Scheduler.ViewModel
 		}
 
 		private Appointment geoeffneterTermin;
-
+		
 		public SchedulerAppointmentListVM(List<SchedulerAppointmentDC> appList, List<CompactCustomerDC> allCustomers, List<CompactEmployeeDC> allEmployees, Dictionary<ValueListEntryDC, List<ResourceDC>> lCategoriesToResources) : base(appList)
 		{
 			mCategories2Resources = lCategoriesToResources;
diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
index 4feb61b45..ef69e3409 100644
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs
@@ -7,7 +7,6 @@ using BeWo.ViewModel;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 
-using DevExpress.Data.Linq;
 using BS.Shared.Extensions;
 
 namespace BeWo.Scheduler.ViewModel
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index a58666d85..131268171 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -1018,7 +1018,7 @@ namespace BeWo.View.Detail
         {
             if (tabitem_schuldienst.Content == null)
             {
-                tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehörigkeitsTyp.Klient);
+                //tabitem_schuldienst.Content = new SchulbegleitenderDienst.SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.CustomerOid.Value,SchulbegleitenderZugehörigkeitsTyp.Klient);
             }
         }
 
diff --git a/BeWo/View/Detail/EmployeeView.xaml.cs b/BeWo/View/Detail/EmployeeView.xaml.cs
index 5b4ca96cb..96de097ad 100644
--- a/BeWo/View/Detail/EmployeeView.xaml.cs
+++ b/BeWo/View/Detail/EmployeeView.xaml.cs
@@ -468,7 +468,7 @@ namespace BeWo.View.Detail
         {
             if (tabitem_schuldienst.Content == null)
             {
-                tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value,SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter);
+                tabitem_schuldienst.Content = new SchulbegleitenderDienst(TableID.Customer, ViewModel.DataContract.EmployeeOid.Value, SchulbegleitenderZugehörigkeitsTyp.Mitarbeiter);
             }
         }
 
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index a48357962..2c6869e9f 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -10,14 +10,12 @@ using NHibernate;
 using NHibernate.Criterion;
 using NHibernate.Engine;
 using NHibernate.Impl;
-using NHibernate.Loader;
 using NHibernate.Loader.Criteria;
 using NHibernate.Persister.Entity;
 using NHibernate.SqlCommand;
 
 using BS.Shared.Core;
 using BS.Shared;
-using BS.Shared.DataContracts.Compact;
 using Login = BeWo.Data.Entities.Login;
 
 namespace BeWo.Data.Access
diff --git a/Model/Changes_2017_08_21.txt b/Model/Changes_2017_08_21.txt
new file mode 100644
index 000000000..0a1242c49
--- /dev/null
+++ b/Model/Changes_2017_08_21.txt
@@ -0,0 +1,13 @@
+CREATE TABLE customerteam (
+	`Oid` bigint(19) NOT NULL AUTO_INCREMENT,
+	`Tid` int(10) DEFAULT NULL,
+	`Name` varchar(256) DEFAULT NULL,
+	`IsActive` tinyint(4) DEFAULT NULL,
+	`Notice` varchar(1024) DEFAULT NULL,
+	`InsTs` datetime DEFAULT NULL,
+	`InsUser` varchar(256) DEFAULT NULL,
+	`UdpUser` varchar(256) DEFAULT NULL,
+	`Version` bigint(19) DEFAULT NULL,
+	`SystemEntryID` int(10) DEFAULT NULL,
+	PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
diff --git a/Shared/Extensions/ICollectionExtensions.cs b/Shared/Extensions/ICollectionExtensions.cs
index 38984dabd..192169560 100644
--- a/Shared/Extensions/ICollectionExtensions.cs
+++ b/Shared/Extensions/ICollectionExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -44,8 +43,15 @@ namespace BS.Shared.Extensions
 
         public static bool AreEqual<T>(this ICollection<T> pCollection, ICollection<T> pCollection2)
         {
-           throw new Exception("Hier muss noch AddEqual implementiert werden");
-        }
+			if(pCollection.Count != pCollection2.Count)
+			{
+				return false;
+			}
 
+			var tmp1 = pCollection.OrderBy(x => x.GetHashCode()).ToList();
+			var tmp2 = pCollection2.OrderBy(x => x.GetHashCode()).ToList();
+
+			return !pCollection.Where((t, i) => !tmp1.ElementAt(i).Equals(tmp2.ElementAt(i))).Any();
+		}
     }
 }
\ No newline at end of file