Merge remote-tracking branch 'origin/master' into refactor_entity

# Conflicts:
#	.aditoprj/project.version
#	entity/ActivityLink_entity/ActivityLink_entity.aod
#	entity/Activity_entity/Activity_entity.aod
#	entity/Address_entity/Address_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/Contact_entity/Contact_entity.aod
#	entity/Contract_entity/Contract_entity.aod
#	entity/Countries_Entity/Countries_Entity.aod
#	entity/Document_entity/Document_entity.aod
#	entity/Gender_keyword/Gender_keyword.aod
#	entity/ObjectRelation_entity/ObjectRelation_entity.aod
#	entity/Organisation_entity/Organisation_entity.aod
#	entity/Product_entity/Product_entity.aod
#	entity/Productprice_entity/Productprice_entity.aod
#	entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
#	entity/Salesproject_entity/Salesproject_entity.aod
#	entity/Task_entity/Task_entity.aod
#	entity/Timetracking_entity/Timetracking_entity.aod
#	entity/Turnover_entity/Turnover_entity.aod