Re-added in object serialization. Commented out smile serialization.
Fixed the changes
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By grey (11) and others
# Via Todd Nine (4) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (21 commits)
  Updated async processing modules and guice wiring.
  Fixes configuration for guice and queues
  Added Serializable to Ids
  Fix some compile errors that resulted from "refactor" merge.
  Merge branch 'GERey-DPS-879-sqs-timeouts-impl' into refactor
  Updated core module to be common
  Renamed project to framework.
  Updated query module
  Finished refactor.
  Initial commit of major refactor.  Need to test
  removed integration tests.
  Changed all the files and most of the localTimeoutQueue tests to implement serializable. All the tests for SQS side of things pass.
  Fixed the tests to correctly check against the visibility timeout.
  Added fix for test always taking 10 seconds.
  Added logging messages to track the sqs progress. Fixed test to query multiple times for sqs messages.
  Ignored the tests because they are integration tests.
  Cleaned the files of commented out code.
  Added in amazon sqs support , completing ticket DPS-879.
  Currently doesn’t work, but added in the core framework for all three methods. Just need to finish up the serialization stuff. Updated interface to specify that the timeouts are visibility timeouts.
  Fixed SimpleTimeoutQueue implementation.
  ...

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Yigit Sapli (8) and Alex Karasulu (2)
# Via Yigit Sapli
* 'two-dot-o' of https://github.com/usergrid/usergrid:
  chop/USERGRID-138 runner is now working properly
  fixing runner local port bypass issue
  Removing unused properties, related code and fixing certificate issue in runner
  Running runner.jar on instances as root and preliminary StartResource on webapp
  Destroy stack operation is implemented
  switched back to non-blocking setup operation
  chop/USERGRID-137 Setup runners
  chop/USERGRID-136 Fixes ssh bug during setup stack
  testing a PR
  Initial import of Judo Chop: please see software grant in archives for Usergrid
Added corepersistence module to stack pom.xml
Added names to corepersistence modules
Added common Eclipse IDE files to .gitignore
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into two-dot-o

# By Shawn Feldman (76) and others
# Via Rod Simpson (30) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (310 commits)
  Fix Guice injection errors.
  Changes to allow CpEntityManager to work with new IndexScope stuff.
  apache header
  move entityversion
  test passing
  test passing
  More progress on tests, 90% now passing.
  add new class EntityVersion
  USERGRID-149 deleting existing runner.jar while redeploying
  Fixing blocking ssh stderr issue
  Ensuring uploaded key files only have read-write permissions for owner
  First pass and cleaning up scope usage.  Need to work on the CP EM integration.
  Chop/USERGRID-145 removing conflicting xml parser modules
  Almost but one scheduler test now passing, 89% overall passing.
  Setting Hystrix thread count to 3000 instead of 1000 eliminates the Hystrix errors, 88% of tests now passing with CP.
  Fix rx version number.
  Core Persistence implementation now passing 226 of 273 (82%) Usergrid Core tests.
  Should not be under source code control.
  fix edgedeletelistener
  Rollback accidental rule commit
  ...
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
Updated tests and modules to use timeout factories.  Local only implemented first pass.

USERGRID-153
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