Most of CollectionIT#testCollection now works, except, mysteriously, for the sort by content bit.
Merge branch 'entity-manager' of https://github.com/usergrid/usergrid into USERGRID-129-implement-apps

# By Dave Johnson
# Via Dave Johnson
* 'entity-manager' of https://github.com/usergrid/usergrid:
  Most of CollectionIT#testCollection now works, except, mysteriously, for the sort by content bit.