Issue 163: Fixes potential race condition that could allow several index requests to be executed in parallel. Re-enabling index reconciliation mechanism
Issue #163: Fixes potential race condition that could allow several index requests to be executed in parallel. Re-enabling index reconciliation mechanism
Merge branch 'index-reconciliation' of https://github.com/Simperium/simperium-ios into index-reconciliation
Issue #163: Decoupling logs
Issue #163: Updating code style
Merge remote-tracking branch 'origin/develop' into index-reconciliation

Conflicts:
	Simperium/SPWebSocketChannel.m
Merge remote-tracking branch 'origin/develop' into index-reconciliation
SPCoreDataStorage: Removes context-merge workarounds. Forcing insertedObjects to obtain permanent objectID's
Merge remote-tracking branch 'origin/develop' into index-reconciliation
Issue #130: Deletion after re-indexing should be local only
Merge remote-tracking branch 'origin/develop' into index-reconciliation

Conflicts:
	Simperium/SPCoreDataStorage.m
Fixing MOC reference
Merge remote-tracking branch 'origin/develop' into index-reconciliation
Merge remote-tracking branch 'origin/develop' into index-reconciliation
Merge remote-tracking branch 'origin/develop' into index-reconciliation

Conflicts:
	SimperiumTests/XCTestCase+Simperium.h
Merge remote-tracking branch 'origin/develop' into index-reconciliation

Conflicts:
	Simperium/SPCoreDataStorage.m
	Simperium/SPIndexProcessor.m
Merge pull request #169 from Simperium/index-reconciliation

Re-Enable Index Reconciliation