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 in placeholder code for partial updates
Added a working (but not accurate ) test case for partial updates
Added partial updates for second condition where loads come back with multiple versions.
Added wiring for queue listener model. Used load.call from update, I have a feeling that’ll need to be updated…
Added comment about future work
Added todo about calling listener ( if even necessary )
Added updated test for the partial update.
Added in initial support for partial updates. Seems to be working but needs cleaning up. Using the pull request to easily show Todd what’s been done.
Fixed bug in logic of repair, and added case to detect deletes.
Added case that the most recent partial update was a delete.
Added fixes for tests and code, now all relevant tests are passing.
Added guice fig for partial and complete entity distinction.
removed unused fig file.
Merge branch 'two-dot-o' of https://github.com/usergrid/usergrid into USERGRID-140_partial_updates

# By Askat Asanaliev (15) and others
# Via Yigit Sapli (4) and others
* 'two-dot-o' of https://github.com/usergrid/usergrid: (22 commits)
  fixing wrong test completion percentage values in chop web UI
  USERGRID-141 - [CHOP] Improve UI usability... - Fixed issues with runner status
  USERGRID-141 - [CHOP] Improve UI usability... - Fixed issues with runner status
  DPS-1010: creating stack.json and the start of some scripts with instructions
  USERGRID-141 - [CHOP] Improve UI usability... - Clean up legacy code
  USERGRID-141 - [CHOP] Improve UI usability... - Runners status form
  USERGRID-141 - [CHOP] Improve UI usability... - User keys management
  USERGRID-141 - [CHOP] Improve UI usability... - User management
  USERGRID-141 - [CHOP] Improve UI usability... - Completed all the charts
  USERGRID-141 - [CHOP] Improve UI usability... - Refactored the chart layout
  USERGRID-141 - [CHOP] Improve UI usability... - Refactored the module list window
  [CHOP] Fixed NoNodeAvailableException with embedded ES - set the startup pause to 5000 ms
  USERGRID-141 - [CHOP] Improve UI usability... - Iterations chart layout
  chop/USERGRID-138 Stop and Reset operations are working
  USERGRID-141 - [CHOP] Improve UI usability... - Runs chart layout
  USERGRID-141 - [CHOP] Improve UI usability... - Overview chart layout
  chop/USERGRID-138 Start operation is working
  USERGRID-141 - [CHOP] Improve UI usability... - User list window
  USERGRID-141 - [CHOP] Improve UI usability... - Module list window
  chop/USERGRID-138 chop webapp dao refactoring
  ...
Fixed error where results would just take the top entity and not roll it up if it is a delete.
Merge branch 'USERGRID-107' of https://github.com/usergrid/usergrid into USERGRID-140_partial_updates

# By Todd Nine
# Via Todd Nine
* 'USERGRID-107' of https://github.com/usergrid/usergrid:
  Updated tests to use the IT runner.  This starts Cassandra before starting Guice in our IT test environments.
  Fixed tests and cleaned up cassandra usage.  Need to refactor into it's own test runner.
  Updated column family to use leveled compaction due to increased performance.
  Updated tests to execute both in the commit log phase as well as the permanent storage
  Fixes threading scheduler issue with asynchronous processing
  Added helper utility for listening to Queues
  Updated test to more accurately reflect usage
  Added unit tests for ordered merge
  Reverted previous changes and cherry picked only the write listener
  Revert "Updated Cassandra rule to be available as a static resource."
  Updated Cassandra rule to be available as a static resource.

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/load/Load.java
	stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java
Cleaned up WriteStart
Readding test that was lost in the merge