Added more to Entity system.
Added GUI base
Merge branch 'entity' into dev