Fixes to delete, cursor and sort logic -- only one failing test in CollectionsIT now.
Merge branch 'entity-manager' of https://github.com/usergrid/usergrid into dictionary-shoehorn

# By Dave Johnson
# Via Dave Johnson
* 'entity-manager' of https://github.com/usergrid/usergrid:
  Fixes to delete, cursor and sort logic -- only one failing test in CollectionsIT now.

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java