Unified entity

Updates Sample project to demonstrate simplified single entity design. See discussion [here](https://github.com/soliantconsulting/SimpleFM_FMServer_Sample/issues/4)