[master] adding manyToOne and oneToMany entity annotation