base set of entities realized
Merge branch 'develop'