Merge refactor_entity into object-relation

Conflicts:
	entity/Contract_entity/Contract_entity.aod
	entity/ObjectRelation_entity/ObjectRelation_entity.aod
	entity/Pers_entity/Pers_entity.aod
	entity/Pers_entity/entityfields/objectrelation_dfo/children/anyobjecttype_param/code.js