Made Entity's protected members private. Reordered code in Entity. Removed deprecated "isInside" function from Text
Merge branch 'private'