fixed improper foreign key on delete/update
fixed double fetch
Merge branch 'academic-entity'
fixed bug introduced by latest repository changes
Merge branch 'academic-entity'