Refactor so that Query is in same package as in Core Persistence.
Also move Query tree into Core Persistence compatible package.
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into fix-entitymanagerit-tests
Everything compiles with one Query class, except for things that need query.getSelectionResult().
Adding status commit, so we know if something is deleted
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into fix-entitymanagerit-tests
Wrapping up the one query parser work.
Merge branch 'one-query-parser' into two-dot-o
PathQueryIT tests now working.
testcreateanddelete is now passing
change back to single record iterator
remove subscribeson
Merge pull request #168 from usergrid/fix-entitymanagerit-tests

Fix EntityManagerIT - testcreateDeleteUser fix
Fix for EntityManagerIT testCorrectType() test, and some compilation errors in other modules.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o
Merge remote-tracking branch 'origin/two-dot-o' into USERGRID-153

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommit.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/delete/MarkCommitTest.java