Make it work in windows & fix build.gradle
Minor bug fixes to get things working in Windows
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle
Minor build.gradle version variable fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle
Marking all changes with the issues that caused them
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/Test.java
	src/test/java/BasicTest.java
Fixes for setting up tests
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
Merge remote-tracking branch 'upstream/master'
Small fixes for testing change
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle
	src/test/java/com/couchbase/test/lite/LiteTestCaseBase.java
	src/test/java/com/couchbase/test/lite/LiteTestContextBase.java
Merge remote-tracking branch 'upstream/master'

Conflicts:
	build.gradle
Minor stuff