Merge branch 'master' into GH1170

Author: fredericDelaporte

doc/reference/master.xml

@@ -8,6 +8,7 @@
 <!ENTITY persistent-classes     SYSTEM "modules/persistent_classes.xml">
 <!ENTITY basic-mapping          SYSTEM "modules/basic_mapping.xml">
 <!ENTITY collection-mapping     SYSTEM "modules/collection_mapping.xml">
+<!ENTITY associations           SYSTEM "modules/associations.xml">
 <!ENTITY component-mapping      SYSTEM "modules/component_mapping.xml">
 <!ENTITY inheritance-mapping    SYSTEM "modules/inheritance_mapping.xml">
 <!ENTITY manipulating-data      SYSTEM "modules/manipulating_data.xml">
@@ -55,6 +56,7 @@
 
 	&basic-mapping;
 	&collection-mapping;
+	&associations;
 	&component-mapping;
 	&inheritance-mapping;