Closes Issue #128

https://github.com/couchbase/couchbase-lite-java-core/issues/128
Fixes issue #129

https://github.com/couchbase/couchbase-lite-java-core/issues/129
Issue #129 - convert to use AtomicInteger

https://github.com/couchbase/couchbase-lite-java-core/issues/129
Issue #10 - fix attempt

https://github.com/couchbase/couchbase-lite-android-liteserv/issues/10
Fixes Issue #243

https://github.com/couchbase/couchbase-lite-android/issues/243
Issue #243 - make more robust w/ respect to canonicalization

https://github.com/couchbase/couchbase-lite-android/issues/243
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/couchbase/lite/replicator/Replication.java