Added the Entity superclass
Merge branch 'entity' into develop