sort top level entities and User names
Merge branch 'master' of https://github.com/physion/ovation-ui2