issue #92 (moved entities fix)
many inheritance fixes
Merge pull request #95 from SiteSupra/issue_91_joined_inheritance

Issue 91 joined inheritance