Merge entities and node types.
Merge pull request #31 from tienvx/features/merge-node-types-entities

Merge entities and node types.