Getting ready for rebase
Merge branch 'master' of https://github.com/yaronyg/couchbase-lite-android-core