Merge branch 'master' into dev

# Conflicts:
#	build.gradle

Author: greenrobot

README.md

@@ -3,7 +3,7 @@
 # ObjectBox Java (Kotlin, Android)
 ObjectBox is a superfast object-oriented database with strong relation support. ObjectBox is embedded into your Android, Linux, macOS, or Windows app.
 
-**Latest version: [2.0.0 (2018/07/25)](http://objectbox.io/changelog)**
+**Latest version: [2.1.0 (2018/08/15)](https://objectbox.io/changelog)**
 
 Demo code using ObjectBox:
 
@@ -20,7 +20,7 @@ Add this to your root build.gradle (project level):
 
 ```groovy
 buildscript {
-    ext.objectboxVersion = '2.0.0'
+    ext.objectboxVersion = '2.1.0'
     dependencies {
         classpath "io.objectbox:objectbox-gradle-plugin:$objectboxVersion"
     }

build.gradle

@@ -3,7 +3,7 @@ version = ob_version
 
 buildscript {
     ext {
-        ob_version = '2.1.0-SNAPSHOT'
+        ob_version = '2.1.0'
         ob_native_version = ob_version // Be careful to diverge here; easy to forget and hard to find JNI problems
         ob_expected_version = project.hasProperty('expectedVersion') ? project.property('expectedVersion') : 'UNDEFINED'
 

objectbox-java/src/main/java/io/objectbox/BoxStore.java

@@ -59,7 +59,7 @@
 @ThreadSafe
 public class BoxStore implements Closeable {
 
-    private static final String VERSION = "2.0.0-2018-07-25";
+    private static final String VERSION = "2.1.0-2018-08-15";
     private static BoxStore defaultStore;
 
     /** Currently used DB dirs with values from {@link #getCanonicalPath(File)}. */

objectbox-java/src/main/java/io/objectbox/BoxStoreBuilder.java

@@ -227,7 +227,7 @@ private static File getAndroidFilesDir(Object context) {
     }
 
     /**
-     * Sets the maximum number of concurrent readers. For most applications, the default is fine (> 100 readers).
+     * Sets the maximum number of concurrent readers. For most applications, the default is fine (> 100 readers).
      * <p>
      * A "reader" is short for a thread involved in a read transaction.
      * <p>

objectbox-java/src/main/java/io/objectbox/exception/DbMaxReadersExceededException.java

@@ -23,7 +23,7 @@
  * Thrown when the maximum of readers (read transactions) was exceeded.
  * Verify that you run a reasonable amount of threads only.
  * <p>
- * If you intend to work with a very high number of threads (>100), consider increasing the number of maximum readers
+ * If you intend to work with a very high number of threads (&gt;100), consider increasing the number of maximum readers
  * using {@link BoxStoreBuilder#maxReaders(int)} and enabling query retries using
  * {@link BoxStoreBuilder#queryAttempts(int)}.
  * <p>