- fixed problem with OneToOne relation and wrong foreign key name
- prepareDataForEntity() won't reset id field anymore