Merge branch 'master' into feature_rene_17_xrechnung

# Conflicts:
#	.gitignore
#	BeWo/DebugConfig.cs
#	BeWo/ServiceProxy/Generated.cs
#	Data/ASPHibernateSessionManager.cs
#	Host/Web.config
#	Service/Service.csproj
#	Service/ServiceContracts/IAccountingService.cs
#	Service/ServiceImplementations/AccountingServiceImp.cs
#	Shared/Core/Utils.cs
#	Shared/DataContracts/InvoiceBaseDC.cs
#	Shared/Shared.csproj

Controls/Controls.csproj

@@ -170,12 +170,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Shared\Shared.csproj">
-      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
-      <Name>Shared</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>
@@ -193,6 +187,12 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Shared\Shared.csproj">
+      <Project>{2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4}</Project>
+      <Name>Shared</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.