Refactor to allow running outside of Android.
Refactor to allow running outside of Android.
Fix unit tests
Add a test case to detect base64 decode compatibility issue
Pull over the Android impl of Base64 and revert to using it.
Pull over the Android impl of Base64 and revert to using it.
Test uses cblite.util.Base64 now
Merge branch 'refs/heads/portable_java'

Conflicts:
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/Replicator.java
	src/main/java/com/couchbase/cblite/replicator/changetracker/CBLChangeTracker.java
	src/main/java/com/couchbase/cblite/support/CBLRemoteMultipartDownloaderRequest.java
	src/main/java/com/couchbase/cblite/support/CBLRemoteRequest.java
Merge branch 'refs/heads/master' into native_api

Conflicts:
	src/instrumentTest/java/com/couchbase/cblite/Views.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/CBLiteTestCase.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/CRUDOperations.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/ChangeTracker.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/LocalDocs.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/Replicator.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/Router.java
	src/instrumentTest/java/com/couchbase/cblite/testapp/tests/Validations.java
	src/main/java/com/couchbase/cblite/CBLDatabase.java
	src/main/java/com/couchbase/cblite/CBLServer.java
	src/main/java/com/couchbase/cblite/CBLView.java
	src/main/java/com/couchbase/cblite/replicator/CBLPuller.java
	src/main/java/com/couchbase/cblite/replicator/CBLPusher.java
	src/main/java/com/couchbase/cblite/replicator/changetracker/CBLChangeTracker.java
	src/main/java/com/couchbase/cblite/router/CBLRouter.java
	src/main/java/com/couchbase/cblite/router/CBLURLConnection.java
	src/main/java/com/couchbase/cblite/support/CBLBatcher.java
	src/main/java/com/couchbase/cblite/support/CBLMultipartDocumentReader.java
	src/main/java/com/couchbase/cblite/support/CBLRemoteMultipartDownloaderRequest.java
	src/main/java/com/couchbase/cblite/support/CBLRemoteRequest.java
	src/main/java/com/couchbase/cblite/support/FileDirUtils.java
android.util.Log -> cblite.util.Log