Merge commit 'bebb9da'

Conflicts:
	src/FluentNHibernate/FluentNHibernate.csproj
	src/FluentNHibernate/Mapping/Builders/MapBuilder.cs

Author: jagregory

src/FluentNHibernate/FluentNHibernate.csproj

@@ -44,7 +44,11 @@
     <WarningLevel>4</WarningLevel>
     <NoWarn>1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+<<<<<<< HEAD
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+=======
+    <DocumentationFile>bin\Debug\FluentNHibernate.XML</DocumentationFile>
+>>>>>>> bebb9da
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>