entities
bringing in commits from other machine

Merge branch 'unstable' of github.com:sociam/indx into unstable

he commit.