compensate for lazy-loaded associations using proxy classes.
Merge pull request #708 from craigh/EntityAccessEdit

compensate for lazy-loaded associations using proxy classes.
Added missing import refs #700
Merge branch '1.3'