Merge conflict AD.csproj is nu correct opgelost.
Merge branch 'mark'