Added check for public inheritance in makeEntity.
Merge branch 'master' into inferno
Made isType const.
Merge branch 'master' into inferno