Merge master into todo-fixes

entity/ActivityLink_entity/ActivityLink_entity.aod

entity/Activity_entity/Activity_entity.aod

entity/Address_entity/Address_entity.aod

entity/AppointmentLink_entity/AppointmentLink_entity.aod

entity/AttributeRelation_entity/AttributeRelation_entity.aod

entity/AttributeUsage_entity/AttributeUsage_entity.aod

entity/Attribute_entity/Attribute_entity.aod

entity/Communication_entity/Communication_entity.aod

entity/Contract_entity/Contract_entity.aod

entity/Document_entity/Document_entity.aod

...ributeRelation_entity/KeywordAttributeRelation_entity.aod

entity/KeywordAttribute_entity/KeywordAttribute_entity.aod

entity/KeywordEntry_entity/KeywordEntry_entity.aod

entity/ObjectRelation_entity/ObjectRelation_entity.aod

entity/Offer_entity/Offer_entity.aod

entity/Offeritem_entity/Offeritem_entity.aod

entity/Orderitem_entity/Orderitem_entity.aod

entity/Organisation_entity/Organisation_entity.aod

entity/Person_entity/Person_entity.aod

entity/Productprice_entity/Productprice_entity.aod