Update according to the fix for https://github.com/couchbase/couchbase-lite-java-native/issues/8.

- Update couchbase-lite-jave-native.jar
- Update submodule
- Ported CollatorTest.java from android
- Removed deprecated test classes : Test.java and BasicTest.java (#15)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/Test.java
	src/test/java/BasicTest.java