Issue #9 - Reduce complexity in build process https://github.com/couchbase/couchbase-lite-android-liteserv/issues/9
Merge remote-tracking branch 'upstream/master' into thaliauth

Conflicts:
	build.gradle
	dependencies-archive.gradle