progrses
merging progress

Merge branch 'unstable' of github.com:sociam/indx into unstable
merging in entities work

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