diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index c7e2620dd..5a5b2cad3 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -1916,7 +1916,18 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisEmployeeDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisSupportConceptDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Invoicing.BankAccountDC))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.BargeldtransaktionshistoryDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldtransaktionshistoryDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SignatureDC>))]
@@ -2042,18 +2053,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FLSAnalysisDataDetailDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FLSAnalysisDataDetailDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
@@ -2067,6 +2066,7 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Invoicing.BankAccountDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AccountingReportDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AccountingReportRowDC>))]
@@ -4069,29 +4069,29 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateBeWoFoldersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateBeWoFolders(System.Collections.Generic.List<BS.Shared.DataContracts.BeWoFolderDC> dcs);
         
-        // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadDocument)
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadDocument) übereinstimmt.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadDocument", ReplyAction="http://tempuri.org/IStreamingService/UploadDocumentResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadResult UploadDocument(BeWo.ServiceProxy.UploadPackage request);
         
-        // CODEGEN: Generating message contract since the wrapper name (UpdatePackage) of message UpdatePackage does not match the default value (UpdateDocument)
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UpdatePackage) von Nachricht "UpdatePackage" nicht mit dem Standardwert (UpdateDocument) übereinstimmt.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request);
         
-        // CODEGEN: Generating message contract since the wrapper name (UploadChatPackage) of message UploadChatPackage does not match the default value (CreateNewSpeziallStreamChatMessagesDC)
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" +
             "e")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" +
             "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request);
         
-        // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadImportFile)
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadImportFile) übereinstimmt.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadImportFile", ReplyAction="http://tempuri.org/IStreamingService/UploadImportFileResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadImportFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadImportFileResult UploadImportFile(BeWo.ServiceProxy.UploadPackage request);
         
-        // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadPersehFile)
+        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadPersehFile) übereinstimmt.
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadPersehFile", ReplyAction="http://tempuri.org/IStreamingService/UploadPersehFileResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadPersehFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadPersehDocumentResult UploadPersehFile(BeWo.ServiceProxy.UploadPackage request);
@@ -5505,6 +5505,13 @@ namespace BeWo.ServiceProxy
     public interface IOperationsService
     {
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecord", ReplyAction="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecordResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
+            "iceRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetDakotaFileFormat", ReplyAction="http://tempuri.org/IOperationsService/GetDakotaFileFormatResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetDakotaFileFormatBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Nullable<long>>))]
@@ -5817,7 +5824,18 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisEmployeeDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisSupportConceptDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AuslastungAnalysisSupportConceptDC))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Invoicing.BankAccountDC))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.BargeldtransaktionshistoryDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.BargeldtransaktionshistoryDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.SignatureDC>))]
@@ -5943,18 +5961,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.FLSAnalysisDataDetailDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.FLSAnalysisDataDetailDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactTokenDC>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.StatementType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureStateType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Zahlungstyp))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SignatureType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.ServiceRecordValidationResult))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.MessageType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.HomeViewPanelType))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.Auszahlungsintervall))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.VertretungsStatus))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.SchulbegleitenderZugehoerigkeitsTyp))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>))]
-        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.UiElementType))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.SignatureType, System.Collections.Generic.List<long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<System.Collections.Generic.Dictionary<int, long>>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<int, long>))]
@@ -5968,6 +5974,7 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.Compact.CompactCustomerDC, bool>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<long, bool>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.Dictionary<BS.Shared.DataContracts.ServiceRecordDC, System.Collections.Generic.List<BS.Shared.ServiceRecordValidationResult>>))]
+        [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Invoicing.BankAccountDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AuslastungAnalysisRootDC>))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(BS.Shared.DataContracts.Reports.AccountingReportDC))]
         [System.ServiceModel.ServiceKnownTypeAttribute(typeof(System.Collections.Generic.List<BS.Shared.DataContracts.Reports.AccountingReportRowDC>))]
@@ -6163,6 +6170,10 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/InsertTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BS.Shared.DataContracts.DokumentvorlageDC InsertTemplate(BS.Shared.DataContracts.DokumentvorlageDC dc);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/LoadTemplate", ReplyAction="http://tempuri.org/IOperationsService/LoadTemplateResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/LoadTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.DokumentvorlageDC LoadTemplate(long oid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetPlatzhalterForTemplate", ReplyAction="http://tempuri.org/IOperationsService/GetPlatzhalterForTemplateResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetPlatzhalterForTemplateBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForTemplate(BS.Shared.DataContracts.VorlagentabelleDC vt);
@@ -6419,13 +6430,6 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/DeleteSignatureBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void DeleteSignature(long signatureOid, long serviceRecordOid);
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
-            "iceRecord", ReplyAction="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
-            "iceRecordResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/CheckForConfirmationReceiptSignatureForServ" +
-            "iceRecordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType);
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetMessageFromServer", ReplyAction="http://tempuri.org/IOperationsService/GetMessageFromServerResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetMessageFromServerBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         string GetMessageFromServer(BS.Shared.TableID pObjectTid, System.Nullable<long> pObjectOid, BS.Shared.MessageType pMessageType);
@@ -7611,6 +7615,11 @@ namespace BeWo.ServiceProxy
         {
         }
         
+        public bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType)
+        {
+            return base.Channel.CheckForConfirmationReceiptSignatureForServiceRecord(serviceRecordOid, signatureType);
+        }
+        
         public string GetDakotaFileFormat(object param)
         {
             return base.Channel.GetDakotaFileFormat(param);
@@ -7746,6 +7755,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.InsertTemplate(dc);
         }
         
+        public BS.Shared.DataContracts.DokumentvorlageDC LoadTemplate(long oid)
+        {
+            return base.Channel.LoadTemplate(oid);
+        }
+        
         public System.Collections.Generic.List<BS.Shared.DataContracts.PlatzhalterDC> GetPlatzhalterForTemplate(BS.Shared.DataContracts.VorlagentabelleDC vt)
         {
             return base.Channel.GetPlatzhalterForTemplate(vt);
@@ -8006,11 +8020,6 @@ namespace BeWo.ServiceProxy
             base.Channel.DeleteSignature(signatureOid, serviceRecordOid);
         }
         
-        public bool CheckForConfirmationReceiptSignatureForServiceRecord(long serviceRecordOid, BS.Shared.SignatureType signatureType)
-        {
-            return base.Channel.CheckForConfirmationReceiptSignatureForServiceRecord(serviceRecordOid, signatureType);
-        }
-        
         public string GetMessageFromServer(BS.Shared.TableID pObjectTid, System.Nullable<long> pObjectOid, BS.Shared.MessageType pMessageType)
         {
             return base.Channel.GetMessageFromServer(pObjectTid, pObjectOid, pMessageType);
diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index 6235bbd1a..83fcf048d 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -1490,13 +1490,13 @@
                             Selector.Selected="tabitem_SchulDienst_Selected" />
                         <TabItem
                             Name="tabitem_gemeinnutzigearbeit"
-                            Header="Vermittlung Arbeit"
+                            Header="Vermittlung gemeinnütziger Arbeit"
                             Visibility="{Binding Path=PermissionGemeinnutzigeArbeitView, Converter={StaticResource BoolVisibilityConverter}}">
                             <detail:CustomerVermittlungArbeitView />
                         </TabItem>
                         <TabItem
                             Name="tabitem_wohnhilfe"
-                            Header="Wohnhilfe"
+                            Header="Basisdaten BAGW"
                             Visibility="{Binding Path=PermissionWohnhilfeView, Converter={StaticResource BoolVisibilityConverter}}">
                             <detail:CustomerWohnhilfeView />
                         </TabItem>
diff --git a/BeWo/View/Document/DokumenteView.xaml b/BeWo/View/Document/DokumenteView.xaml
index f57c671ff..442458331 100644
--- a/BeWo/View/Document/DokumenteView.xaml
+++ b/BeWo/View/Document/DokumenteView.xaml
@@ -5,6 +5,7 @@
     xmlns:controls="clr-namespace:BeWo.View.Controls"
     xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
     xmlns:dxa="http://schemas.devexpress.com/winfx/2008/xaml/accordion"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
     xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
     xmlns:dxgt="http://schemas.devexpress.com/winfx/2008/xaml/grid/themekeys"
     xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
@@ -419,7 +420,7 @@
                                                         <DataTemplate>
                                                             <Button
                                                                 Width="20"
-                                                                Height="20"
+                                                                Height="23"
                                                                 VerticalAlignment="Center"
                                                                 Click="EditButton_Click"
                                                                 Content="!"
@@ -515,12 +516,19 @@
                                             dx:ThemeManager.ThemeName="Office2010Black"
                                             DefaultSorting="Name">
                                             <dxg:TreeListControl.Columns>
-                                                <dxg:TreeListColumn AllowSorting="True" FieldName="Name" />
+                                                <dxg:TreeListColumn AllowSorting="True" FieldName="Name" AllowEditing="False">
+                                                    <dxg:TreeListColumn.CellTemplate>
+                                                        <DataTemplate>
+                                                            <dxe:TextEdit x:Name="PART_Editor" EditMode="InplaceActive" Text="{Binding Path=DataContext.RowData.Row.Name, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                    AcceptsReturn="False" AcceptsTab="False" TextTrimming="WordEllipsis" TextWrapping="NoWrap" SelectAllOnGotFocus="True" SelectAllOnMouseUp="True" />
+                                                        </DataTemplate>
+                                                    </dxg:TreeListColumn.CellTemplate>
+                                                </dxg:TreeListColumn>
                                             </dxg:TreeListControl.Columns>
                                             <dxg:TreeListControl.View>
                                                 <dxg:TreeListView
                                                     x:Name="TemplateTreeView"
-                                                    AllowEditing="False"
+                                                    AllowEditing="True"
                                                     AutoWidth="True"
                                                     ContextMenu="{StaticResource templatecm}"
                                                     FocusedRowChanged="TemplateTreeView_FocusedRowChanged"
@@ -529,7 +537,8 @@
                                                     LostFocus="TemplateTreeView_LostFocus"
                                                     NodeExpanding="templateTreeListView_NodeExpanding"
                                                     ParentFieldName="Binding DocumentTreeItemVM.ParentOid"
-                                                    PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseLeftButtonDown"
+                                                    PreviewMouseLeftButtonDown="TemplateTreeView_PreviewMouseButtonDown"
+                                                    PreviewMouseRightButtonDown="TemplateTreeView_PreviewMouseButtonDown"
                                                     PrintNodeImages="True"
                                                     ShowColumnHeaders="False"
                                                     ShowHorizontalLines="False"
@@ -538,7 +547,8 @@
                                                     ShowVerticalLines="False"
                                                     VerticalScrollbarVisibility="Auto" 
                                                     AutoExpandOnDrag="True"
-                                                    NavigationStyle="Cell"/>
+                                                    NavigationStyle="Cell"
+                                                    ShownEditor="TemplateTreeView_ShownEditor" />
                                             </dxg:TreeListControl.View>
                                         </dxg:TreeListControl>
                                         <!--
@@ -608,21 +618,36 @@
                                     </Grid>
                                 </dxlc:LayoutGroup>
                                 <dxlc:LayoutGroup dxlc:LayoutControl.AllowHorizontalSizing="True">
-                                    <dxg:GridControl
+                                    <GroupBox
+                                            x:Name="GroupBoxTemplateList"
+                                            Grid.ColumnSpan="2"
+                                            Padding="5"
+                                            Header=""
+                                            Style="{StaticResource ObjectEditGroupBox}">
+
+                                        <Grid>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+
+                                            </Grid.ColumnDefinitions>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="*" />
+                                            </Grid.RowDefinitions>
+                                            <dxg:GridControl
                                         x:Name="datagrid_templates"
                                         Grid.Row="0"
                                         Grid.Column="1"
                                         Margin="2,3,5,5">
-                                        <dxg:GridControl.Columns>
-                                            <dxg:GridColumn
+                                                <dxg:GridControl.Columns>
+                                                    <dxg:GridColumn
                                                 Width="24"
                                                 FieldName="FileName"
                                                 FixedWidth="True"
                                                 Header=""
                                                 ReadOnly="True">
-                                                <dxg:GridColumn.CellTemplate>
-                                                    <DataTemplate>
-                                                        <Button
+                                                        <dxg:GridColumn.CellTemplate>
+                                                            <DataTemplate>
+                                                                <Button
                                                             Width="20"
                                                             Height="20"
                                                             Margin="1"
@@ -630,64 +655,67 @@
                                                             Click="TemplateDeleteButton_Click"
                                                             Content="r"
                                                             FontFamily="Webdings" />
-                                                    </DataTemplate>
-                                                </dxg:GridColumn.CellTemplate>
-                                            </dxg:GridColumn>
-                                            <dxg:GridColumn
+                                                            </DataTemplate>
+                                                        </dxg:GridColumn.CellTemplate>
+                                                    </dxg:GridColumn>
+                                                    <dxg:GridColumn
                                                 Width="*"
                                                 AllowEditing="False"
                                                 FieldName="Name"
                                                 Header="Name" />
-                                            <dxg:GridColumn
+                                                    <dxg:GridColumn
                                                 Width="*"
                                                 AllowEditing="False"
                                                 FieldName="Beschreibung"
                                                 Header="Beschreibung" />
-                                            <dxg:GridColumn
+                                                    <dxg:GridColumn
                                                 Width="80"
                                                 FieldName="FileEdit"
                                                 FixedWidth="True"
                                                 Header=""
                                                 ReadOnly="True">
-                                                <dxg:GridColumn.CellTemplate>
-                                                    <DataTemplate>
-                                                        <Button
+                                                        <dxg:GridColumn.CellTemplate>
+                                                            <DataTemplate>
+                                                                <Button
                                                             Width="75"
-                                                            Height="20"
+                                                            Height="23"
                                                             VerticalAlignment="Center"
                                                             Click="EditTemplate_Click"
                                                             Content="Bearbeiten" />
-                                                    </DataTemplate>
-                                                </dxg:GridColumn.CellTemplate>
-                                            </dxg:GridColumn>
-                                            <dxg:GridColumn
+                                                            </DataTemplate>
+                                                        </dxg:GridColumn.CellTemplate>
+                                                    </dxg:GridColumn>
+                                                    <!--<dxg:GridColumn
                                                 Width="80"
                                                 FieldName="PrintFile"
                                                 FixedWidth="True"
                                                 Header=""
                                                 ReadOnly="True">
-                                                <dxg:GridColumn.CellTemplate>
-                                                    <DataTemplate>
-                                                        <Button
+                                                        <dxg:GridColumn.CellTemplate>
+                                                            <DataTemplate>
+                                                                <Button
                                                             Width="75"
-                                                            Height="20"
+                                                            Height="23"
                                                             VerticalAlignment="Center"
                                                             Click="PrintTemplate_Click"
                                                             Content="Drucken" />
-                                                    </DataTemplate>
-                                                </dxg:GridColumn.CellTemplate>
-                                            </dxg:GridColumn>
-                                        </dxg:GridControl.Columns>
-                                        <dxg:GridControl.View>
-                                            <dxg:TableView
+                                                            </DataTemplate>
+                                                        </dxg:GridColumn.CellTemplate>
+                                                    </dxg:GridColumn>-->
+                                                </dxg:GridControl.Columns>
+                                                <dxg:GridControl.View>
+                                                    <dxg:TableView
                                                 x:Name="TemplateTableView"
                                                 AutoWidth="false"
                                                 NavigationStyle="Row"
                                                 ShowGroupPanel="False"
                                                 ShowGroupedColumns="false"
-                                                ShowTotalSummary="False" />
-                                        </dxg:GridControl.View>
-                                    </dxg:GridControl>
+                                                ShowTotalSummary="False" 
+                                                RowDoubleClick="TemplateTableView_RowDoubleClick"/>
+                                                </dxg:GridControl.View>
+                                            </dxg:GridControl>
+                                        </Grid>
+                                    </GroupBox>
                                 </dxlc:LayoutGroup>
                             </dxlc:LayoutControl>
                         </TabItem>
diff --git a/BeWo/View/Document/DokumenteView.xaml.cs b/BeWo/View/Document/DokumenteView.xaml.cs
index 81d5dd3c9..94c8f93ed 100644
--- a/BeWo/View/Document/DokumenteView.xaml.cs
+++ b/BeWo/View/Document/DokumenteView.xaml.cs
@@ -32,6 +32,7 @@ using System.Windows.Documents;
 using System.Windows.Navigation;
 using ContextMenu = System.Windows.Controls.ContextMenu;
 using MenuItem = System.Windows.Controls.MenuItem;
+using GroupBox = System.Windows.Controls.GroupBox;
 using System.Windows.Controls.Primitives;
 using TextBox = System.Windows.Controls.TextBox;
 using BS.Shared.DataContracts.Compact;
@@ -835,7 +836,7 @@ namespace BeWo.View.Document
             var vm = e.NewRow as DocumentTreeItemVM;
             if (vm != null)
             {
-                SetSelectedText(vm);
+                SetSelectedText(vm, documents_treeview_control, GroupBoxDokumentenListe);
                 SetItemSourceForFileGrid(vm);
             }
         }
@@ -984,33 +985,33 @@ namespace BeWo.View.Document
         //    var dti = DocumentsTreeView.GetNodeByContent(node);
         //}
 
-        private void SetSelectedText(DocumentTreeItemVM selected)
+        private void SetSelectedText(DocumentTreeItemVM selected, TreeListControl treeListControl, GroupBox groupBox)
         {
-            GroupBoxDokumentenListe.Header = "";
+            groupBox.Header = "";
 
-            var node = DocumentsTreeView.GetNodeByContent(selected);
+            var node = treeListControl.View.GetNodeByContent(selected);
 
-            AddPathToSelectedText(selected, node);
+            AddPathToSelectedText(selected, node, treeListControl, groupBox);
             //String path = selected.
             
             
         }
 
-        private void AddPathToSelectedText(DocumentTreeItemVM vm, TreeListNode node)
+        private void AddPathToSelectedText(DocumentTreeItemVM vm, TreeListNode node, TreeListControl treeListControl, GroupBox groupBox)
         {
             if (vm != null && node != null)
             {
                 String path = vm.Name;
-                if (!String.IsNullOrEmpty((String)GroupBoxDokumentenListe.Header))
+                if (!String.IsNullOrEmpty((String)groupBox.Header))
                 {
-                    path = String.Format("{0} > {1}", vm.Name, GroupBoxDokumentenListe.Header);
+                    path = String.Format("{0} > {1}", vm.Name, groupBox.Header);
                 }
-                GroupBoxDokumentenListe.Header = path;
+                groupBox.Header = path;
                 if (node.ParentNode != null)
                 {
-                    var parentVm = documents_treeview_control.GetRow(node.ParentNode.RowHandle) as DocumentTreeItemVM;
+                    var parentVm = treeListControl.GetRow(node.ParentNode.RowHandle) as DocumentTreeItemVM;
 
-                    AddPathToSelectedText(parentVm, node.ParentNode);
+                    AddPathToSelectedText(parentVm, node.ParentNode, treeListControl, groupBox);
 
                     //DocumentsTreeView.GetRowElementByTreeElement(node.ParentNode);
                 }
@@ -1449,27 +1450,16 @@ namespace BeWo.View.Document
                 }
                 else if (twi.Header.Equals("Neue Vorlage"))
                 {
-                    var vm = new DokumentvorlageVM(new DokumentvorlageDC());
-
                     VorlagentabelleDC tabelle = ServiceFacade.DoOperationsServiceSync(s => s.GetVorlagentabelleById((long)row.DataContract.BeWoFolderDC.ObjectOid));
-                    vm.Tabellenzugehoerigkeit = (long)tabelle.VorlagentabelleObjectTid;
-                    vm.Parent = row.DataContract.BeWoFolderDC.BeWoFolderOid;
 
-                    var savedTemplate = EditTemplate(vm);
-                    if (savedTemplate != null)
-                    {
-                        if (savedTemplate.IsDirty)
-                        {
-                            var savedDC = SaveInDatabase(savedTemplate);
-                            savedTemplate = new DokumentvorlageVM(savedDC);
-                            var tableitems = datagrid_templates.ItemsSource as BindingList<DokumentvorlageVM>;
-                            datagrid_templates.ItemsSource = new BindingList<DokumentvorlageVM>();
+                    var dc = new DokumentvorlageDC();
+                    dc.Tabellenzugehoerigkeit = (long)tabelle.VorlagentabelleObjectTid;
+                    dc.Parent = row.DataContract.BeWoFolderDC.BeWoFolderOid;
 
-                            tableitems.Add(savedTemplate);
-                            datagrid_templates.ItemsSource = tableitems;
-                        }
+                    var vm = new DokumentvorlageVM(dc);
 
-                    }
+                    
+                    EditTemplate(vm);
                 }
             }
         }
@@ -1502,11 +1492,14 @@ namespace BeWo.View.Document
             control.ButtonSavedClicked += () =>
             {
                 saved = true;
-                if (control.ViewModel.IsDirty)
+                if (control.ViewModel.IsNew || control.ViewModel.IsDirty)
                 {
                     var dc = SaveInDatabase(control.ViewModel);
                     vm.DataContract = dc;
+
+                    RefreshSelectedList();
                 }
+
                 beWoWindow.Close();
             };
 
@@ -1554,17 +1547,32 @@ namespace BeWo.View.Document
 
         private void EditSelectedTemplateFolder()
         {
-            TemplateTreeView.AllowEditing = true;
-            //template_treeview_control.Focus();
+            var col = template_treeview_control.Columns[0];
+
+            col.AllowEditing = DefaultBoolean.True;
+            //TemplateTreeView.ShowEditForm();
+            //col.EditFormVisible = true;
+            //col.Focus();
+            TemplateTreeView.ShowEditor(true);
             //var h = TemplateTreeView.FocusedRowHandle;
 
             //TemplateTreeView.SelectCell(h, template_treeview_control.Columns[0]);
+            //TemplateTreeView.ShowEditForm();
+
+
         }
 
         private void TemplateTreeView_FocusedRowChanged(object sender, FocusedRowChangedEventArgs e)
         {
-            if (TemplateTreeView.AllowEditing == true)
-                TemplateTreeView.AllowEditing = false;
+            //if (TemplateTreeView.AllowEditing == true)
+            //    TemplateTreeView.AllowEditing = false;
+            template_treeview_control.Columns[0].AllowEditing = DefaultBoolean.False;
+
+            var vm = e.NewRow as DocumentTreeItemVM;
+            if (vm != null)
+            {
+                SetSelectedText(vm, template_treeview_control, GroupBoxTemplateList);
+            }
         }
         private void TemplateTreeView_LostFocus(object sender, RoutedEventArgs e)
         {
@@ -1614,51 +1622,58 @@ namespace BeWo.View.Document
             ServiceFacade.DoOperationsServiceSync(s => s.DeleteFolder((long)folder.BeWoFolderOid, (long)folder.BeWoFolderVersion));
         }
 
-        private void TemplateTreeView_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void TemplateTreeView_PreviewMouseButtonDown(object sender, MouseButtonEventArgs e)
         {
-            var source = e.Source as TreeListView;
-            if (source.SelectedRows.Count == 1)
+            RefreshSelectedList();
+        }
+
+        private void RefreshSelectedList()
+        {
+            if (TemplateTreeView.SelectedRows.Count == 1)
             {
-                var selected = source.SelectedRows[0] as DocumentTreeItemVM;
+                var selected = TemplateTreeView.SelectedRows[0] as DocumentTreeItemVM;
 
                 if (selected == null || selected.DataContract.BeWoFolderDC.Name == "RootFolder")
                 {
                     datagrid_templates.ItemsSource = new BindingList<DokumentvorlageVM>();
                     return;
-                } 
-                  
+                }
 
                 var vmList = new BindingList<DokumentvorlageVM>();
-                 
-                //BeWoFolderDC folderDC = ServiceFacade.DoOperationsServiceSync(s => s.GetFolderById((long)selected.DocTreeItemOid));
-                //var folderDC_Oid = folderDC.BeWoFolderOid;
+
                 if (selected.DataContract.BeWoFolderDC == null)
                     return;
-                //if(folderDC != null)
-                //{
-                    var folderOid = selected.DataContract.BeWoFolderDC.BeWoFolderOid;
+                
+                var folderOid = selected.DataContract.BeWoFolderDC.BeWoFolderOid;
 
                 var vorlagenInOrdner = ServiceFacade.DoOperationsServiceSync(s => s.GetDokumentvorlagenInFolder((long)folderOid));
-                    foreach(DokumentvorlageDC dc in vorlagenInOrdner)
-                    {
-                        vmList.Add(new DokumentvorlageVM(dc));
-                    }
-
-                    datagrid_templates.ItemsSource = vmList;
-
-                //}
+                foreach (DokumentvorlageDC dc in vorlagenInOrdner)
+                {
+                    vmList.Add(new DokumentvorlageVM(dc));
+                }
 
+                datagrid_templates.ItemsSource = vmList;
 
             }
         }
 
         private void EditTemplate_Click(object sender, RoutedEventArgs e)
         {
-            var templateVM = datagrid_templates.SelectedItem as DokumentvorlageVM;
-            EditTemplate(templateVM);
-            
-                
+            EditSelectedTemplate();
         }
+
+        private void EditSelectedTemplate()
+        {
+            var templateVM = datagrid_templates.SelectedItem as DokumentvorlageVM;
+            if (templateVM != null && templateVM.DataContract.DokumentvorlageOid.HasValue)
+            {
+                var dc = ServiceFacade.DoOperationsServiceSync(s => s.LoadTemplate(templateVM.DataContract.DokumentvorlageOid.Value));
+                var copy = new DokumentvorlageVM(dc);
+
+                EditTemplate(copy);
+            }
+        }
+
         private void PrintTemplate_Click(object sender, RoutedEventArgs e)
         {
             var templateVM = datagrid_templates.SelectedItem as DokumentvorlageVM;
@@ -2056,6 +2071,20 @@ namespace BeWo.View.Document
             popup_UploadFiles.IsOpen = false;
         }
 
+        private void DocumentsTreeView_ShownEditor(object sender, TreeListEditorEventArgs e)
+        {
+
+        }
+
+        private void TemplateTreeView_ShownEditor(object sender, TreeListEditorEventArgs e)
+        {
+            //e.Editor.SelectAll();
+        }
+
+        private void TemplateTableView_RowDoubleClick(object sender, RowDoubleClickEventArgs e)
+        {
+            EditSelectedTemplate();
+        }
     }
 
     internal class DocumentRootNodeConfig
diff --git a/BeWo/View/Document/VorlageEditView.xaml b/BeWo/View/Document/VorlageEditView.xaml
index 0a4f756b8..df6570b61 100644
--- a/BeWo/View/Document/VorlageEditView.xaml
+++ b/BeWo/View/Document/VorlageEditView.xaml
@@ -19,7 +19,7 @@
 
     <Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="60" /> <!-- Felder für Vorlagenname und Beschreibung -->
+            <RowDefinition Height="Auto" /> <!-- Felder für Vorlagenname und Beschreibung -->
             <RowDefinition Height="*" /> <!-- Platzhalter-Dropdown und Texteditor -->
             <RowDefinition Height="50" /> <!-- Speichern und abbrechen -->
         </Grid.RowDefinitions>
@@ -38,7 +38,7 @@
             <Label Grid.Column="0" Grid.Row="1" Content="Beschreibung" />
 
             <TextBox x:Name="TextEdit_Vorlagenname" Grid.Column="1" Grid.Row="0" Height="23" Margin="3,0,3,3" Text="{Binding Name}"/>
-            <TextBox x:Name="TextEdit_Beschreibung" Grid.Column="1" Grid.Row="1" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Height="23" Margin="3,0,3,3" Text="{Binding Beschreibung}"/>
+            <TextBox x:Name="TextEdit_Beschreibung" Grid.Column="1" Grid.Row="1" MinHeight="23" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" MaxHeight="60" Margin="3,0,3,3" Text="{Binding Beschreibung}"/>
         </Grid>
 
         <Grid Grid.Row="1" Margin="3 10 3 0">
@@ -62,7 +62,7 @@
                     <dxg:TreeListControl.View>
                         <dxg:TreeListView x:Name="TemplatesTreeView" ShowColumnHeaders="False" ShowIndicator="False" ShowHorizontalLines="False" ShowVerticalLines="False"    
 	                        AllowEditing="False" ImageFieldName="Icon" ShowNodeImages="True" PrintNodeImages="True" VerticalScrollbarVisibility="Auto" HorizontalScrollbarVisibility="Auto"
-                            TreeDerivationMode="ChildNodesSelector" ChildNodesPath="Children" MouseDoubleClick="TemplatesTreeView_MouseDoubleClick" >
+                            TreeDerivationMode="ChildNodesSelector" ChildNodesPath="Children" MouseDoubleClick="TemplatesTreeView_MouseDoubleClick" ToolTip="Mit Doppelklick an der aktuellen Cursor Position einfügen">
                             </dxg:TreeListView>
                     </dxg:TreeListControl.View>
                 </dxg:TreeListControl>
diff --git a/BeWo/View/Document/VorlageEditView.xaml.cs b/BeWo/View/Document/VorlageEditView.xaml.cs
index 500a1cb8b..cb30d42e6 100644
--- a/BeWo/View/Document/VorlageEditView.xaml.cs
+++ b/BeWo/View/Document/VorlageEditView.xaml.cs
@@ -64,9 +64,7 @@ namespace BeWo.View.Document
         {
             InitializeComponent();
             VorlagenTabelle = vorlagenTabelle;
-            var copy = new DokumentvorlageVM(pVM.DataContract);
-            ViewModel = copy;
-            
+            ViewModel = pVM;
             DataContext = pVM;
 
             if (pVM.Text != null)
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index 359256714..5ef28c91b 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>false</UseIISExpress>
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/Model/Changes_2025_03_26 SignatureHistory.sql b/Model/Changes_2025_03_26 SignatureHistory.sql
index 87388d65e..b9b181c3c 100644
--- a/Model/Changes_2025_03_26 SignatureHistory.sql	
+++ b/Model/Changes_2025_03_26 SignatureHistory.sql	
@@ -28,4 +28,5 @@ CREATE TABLE `servicerecord2signaturehistory` (
     `SignatureHistoryOid` BIGINT DEFAULT NULL,
     `ServiceRecordOid` BIGINT DEFAULT NULL,
     FOREIGN KEY (`SignatureHistoryOid`) REFERENCES `signaturehistory`(`Oid`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
diff --git a/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs b/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs
index 984e55a83..79d02d589 100644
--- a/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs
+++ b/ReportImp/ProfEggersStiftung/Invoicing/PflegeInvoiceCreation.cs
@@ -206,7 +206,7 @@ namespace ProfEggersStiftung.Invoicing
                 {
                     alter = abrechnungStart.Year - customer.Person.DateOfBirth.Value.Year;
                     var dt = customer.Person.DateOfBirth.Value.AddYears(alter);
-                    if (abrechnungStart.CompareTo(dt) < 0)
+                    if (abrechnungEnde.CompareTo(dt) < 0)
                     {
                         alter--;
                     }
diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs
index 184098c5f..86b5a4b14 100644
--- a/Service/Plugins/PluginLoader.cs
+++ b/Service/Plugins/PluginLoader.cs
@@ -65,7 +65,7 @@ namespace BeWo.Service.Plugins
                 //t = "2542550178"; // LWVEingliederungshilfe
                 //t = "3963982016"; // Convoi
                 //t = "1600408120"; // BeWo Amrath
-                t = "3886054624"; // Brücke ABW
+                //t = "3886054624"; // Brücke ABW
                 //t = "2028095630"; // Integra Heinsberg
                 //t = "5351926758"; // Viva a Vida
                 //t = "2215396183"; // Diakonie Remscheid Lennep
@@ -386,7 +386,7 @@ namespace BeWo.Service.Plugins
                 //t = "5315865694"; // Wismarer Werkstätten
                 //t = "7113513872"; // Verein für Beratung und Therapie - LOK
                 //t = "1676990640"; // Perspektive - Selbständiges Leben
-                //t = "2544632712"; // Wabe gGmbH
+                //t = "2544632712"; // Wabe gGmbHs
                 //t = "7077286353"; // PariSozial
                 //t = "8735029937"; // Caritas Ostvest
                 //t = "7653029063"; // SkF Leverkusen JuHi
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 74cc980dc..33a0eee19 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -1123,6 +1123,10 @@ namespace BeWo.Service.ServiceContracts
         [OperationContract]
         DokumentvorlageDC InsertTemplate(DokumentvorlageDC dc);
 
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        DokumentvorlageDC LoadTemplate(long oid);
+
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<PlatzhalterDC> GetPlatzhalterForTemplate(VorlagentabelleDC vt);
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 3b6226179..e9e69c121 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -7668,7 +7668,21 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var vm = PluginLoader.FindClass<VorlagenManager>();
 
-                return vm.InsertTemplate(dc);
+                return vm.InsertOrUpdateTemplate(dc);
+            }
+            catch (Exception ex)
+            {
+                throw Utils.CreateBeWoFaultException(ex);
+            }
+        }
+
+        public DokumentvorlageDC LoadTemplate(long oid)
+        {
+            try
+            {
+                var vm = PluginLoader.FindClass<VorlagenManager>();
+
+                return vm.LoadTemplate(oid);
             }
             catch (Exception ex)
             {
diff --git a/Service/ServiceImplementations/ValueListServiceImp.cs b/Service/ServiceImplementations/ValueListServiceImp.cs
index 3c4382f4f..cc775cd76 100644
--- a/Service/ServiceImplementations/ValueListServiceImp.cs
+++ b/Service/ServiceImplementations/ValueListServiceImp.cs
@@ -88,6 +88,10 @@ namespace BeWo.Service.ServiceImplementations
 		{
 			try
 			{
+				if (pTypes != null && pTypes.Count == 2 && pTypes[0] == ValueListEntryType.SupportConceptGoalType && pTypes[1] == ValueListEntryType.SupportConceptGoalCategoryType)
+                {
+					//FixFalscheZiele();
+                }
 				var list = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDCs(DAOFactory.SearchDAO.FindValueListEntries(pTypes).Where(ve => ve.IsActive == ActivationTypeId.Active)).ToArray();
 			    return list.OrderBy(ve => String.Format("{0}-{1}", ve.Abbreviation, ve.TypeDescription)).ToArray();
             }
@@ -97,7 +101,101 @@ namespace BeWo.Service.ServiceImplementations
 			}
 		}
 
-	    public ValueListEntryDC GetValueListEntryByOid(long pOid)
+        private void FixFalscheZiele()
+        {
+			if ("9417634361".Equals(Plugins.PluginLoader.Tenant))
+            {
+				var entries = DAOFactory.SearchDAO.FindValueListEntries(new[]
+							{
+								ValueListEntryType.SupportConceptGoalCategoryType,
+								ValueListEntryType.SupportConceptIndividualGoalCategoryType
+							}.ToList()).Where(ve => ve.IsActive == ActivationTypeId.Active).ToList(); ;
+
+				var gemeinschaft = entries.Where(e => e.Oid == 566).FirstOrDefault();
+				var lebensbereich = entries.Where(e => e.Oid == 567).FirstOrDefault();
+				var interaktion = entries.Where(e => e.Oid == 568).FirstOrDefault();
+				var hausleben = entries.Where(e => e.Oid == 569).FirstOrDefault();
+				var selbst = entries.Where(e => e.Oid == 570).FirstOrDefault();
+				var mobil = entries.Where(e => e.Oid == 571).FirstOrDefault();
+				var kommunikation = entries.Where(e => e.Oid == 572).FirstOrDefault();
+				var aufgaben = entries.Where(e => e.Oid == 573).FirstOrDefault();
+				var lernen = entries.Where(e => e.Oid == 574).FirstOrDefault();
+				
+				
+				
+
+				foreach (var item in entries)
+                {
+					if (item.Type == ValueListEntryType.SupportConceptGoalCategoryType)
+                    {
+						if ("eutende Lebensbereiche".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(lebensbereich, item, entries);
+						}
+						else if ("erpersonelle Interaktionen und Beziehungen".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(interaktion, item, entries);
+						}
+						else if ("bilität".Equals(item.Value) || "ilität".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(mobil, item, entries);
+						}
+						else if ("bstversorgung".Equals(item.Value) || "lbstversorgung".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(selbst, item, entries);
+						}
+						else if ("einschafts-, soziales und staatsbürgerliches Leben".Equals(item.Value) || "Gemeinschafts-, soziales und staatsbürgerliches Leben".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(gemeinschaft, item, entries);
+						}
+						else if ("lgemeine Aufgaben u. Anforderungen".Equals(item.Value) || "Allgemeine Aufgaben u. Anforderungen".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(aufgaben, item, entries);
+						}
+						else if ("munikation".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(kommunikation, item, entries);
+						}
+						else if ("sliches Leben".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(hausleben, item, entries);
+						}
+						else if ("rnen und Wissensanwendung".Equals(item.Value))
+						{
+							MergeSubZieleUndMassnahmen(lernen, item, entries);
+						}
+					}
+					//if (item.)
+                }
+            }
+        }
+
+        private void MergeSubZieleUndMassnahmen(ValueListEntry lebensbereich, ValueListEntry item2Merge, IList<ValueListEntry> alleEntries)
+        {
+            foreach (var item in alleEntries)
+            {
+				if (item.ParentOid.HasValue && item.ParentOid == item2Merge.Oid)
+                {
+                    item.ParentOid = lebensbereich.Oid;
+
+					DAOFactory.GenericDAO.Update(item);
+                }
+            }
+
+			foreach (var v2o in item2Merge.ValueListEntry2Objects)
+			{
+				var sql = String.Format("update valuelistentry2object set valuelistentryoid = {0} where oid = {1}", lebensbereich.Oid, v2o.Oid);
+				var result = DAOFactory.SearchDAO.GetSqlResult(sql);
+				//
+				//update customer set debitornumber = '5' + debitornumber where debitornumber is not null
+			}
+
+			item2Merge.IsActive = ActivationTypeId.Deleted;
+
+			DAOFactory.GenericDAO.Update(item2Merge);
+		}
+
+        public ValueListEntryDC GetValueListEntryByOid(long pOid)
 	    {
             try
             {
diff --git a/Service/Vorlagen/VorlagenManager.cs b/Service/Vorlagen/VorlagenManager.cs
index 73e19d647..41a8a69be 100644
--- a/Service/Vorlagen/VorlagenManager.cs
+++ b/Service/Vorlagen/VorlagenManager.cs
@@ -31,7 +31,7 @@ namespace BeWo.Service.Vorlagen
             return list;
 
         }
-        public DokumentvorlageDC InsertTemplate(DokumentvorlageDC dc)
+        public DokumentvorlageDC InsertOrUpdateTemplate(DokumentvorlageDC dc)
         {
             Dokumentvorlage entity = null;
             if (dc.DokumentvorlageOid == null)
@@ -52,6 +52,12 @@ namespace BeWo.Service.Vorlagen
             return updatedTemplateDC;
         }
 
+        public virtual DokumentvorlageDC LoadTemplate(long oid)
+        {
+            var entity = DAOFactory.GenericDAO.LoadByID<Dokumentvorlage>(oid);
+            return MapperFactory.DokumentvorlageDC_Dokumentvorlage.MapToNewDC(entity);
+        }
+
         public List<PlatzhalterDC> GetPlatzhalterForTemplate(VorlagentabelleDC vt)
         {
             var tid = (TableID)vt.VorlagentabelleObjectTid;
@@ -122,6 +128,20 @@ namespace BeWo.Service.Vorlagen
             PlatzhalterDC ort = new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "KlientOrt", IconType = "AB", FieldName = "Person.Address.Town" };
             adressdatenKlient.Children.Add(ort);
             #endregion
+
+            PlatzhalterDC vga = new PlatzhalterDC()
+            {
+                Bezeichnung = "Vermittlung gemeinnütziger Arbeit",
+                Children = new List<PlatzhalterDC>(),
+                IconType = "BoyAndGirl"
+            };
+            #region Children Vermittlung gemeinnütziger Arbeit
+            vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Straße", Platzhalter = "KlientStrasse", FieldName = "Person.Address.Street", IconType = "AB"});
+            vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "PLZ", Platzhalter = "KlientPLZ", FieldName = "Person.Address.PostalCode", IconType = "AB" });
+            vga.Children.Add(new PlatzhalterDC() { Bezeichnung = "Ort", Platzhalter = "KlientOrt", FieldName = "Person.Address.Town", IconType = "AB" });
+            #endregion
+
+
             PlatzhalterDC betreuung = new PlatzhalterDC()
             {
                 Bezeichnung = "Betreuung",
@@ -193,6 +213,7 @@ namespace BeWo.Service.Vorlagen
 
             liste.Add(personendaten);
             liste.Add(adressdatenKlient);
+            liste.Add(vga);
             //liste.Add(adressdatenOrganisation);
             liste.Add(betreuung);
             liste.Add(sonstiges);
@@ -1071,5 +1092,6 @@ namespace BeWo.Service.Vorlagen
                 return "";
             }
         }
+
     }
 }