Merge tag 'v0.8.3'

[maven-release-plugin]  copy for tag v0.8.3
diff --git a/README.md b/README.md
index ecf9ce7..88d0d81 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>io.prediction</groupId>
             <artifactId>client</artifactId>
-            <version>0.8.2</version>
+            <version>0.8.3</version>
         </dependency>
     </dependencies>
     ...
@@ -36,7 +36,7 @@
 <ivy-module ...>
     ...
     <dependencies>
-        <dependency org="io.prediction" name="client" rev="0.8.2" />
+        <dependency org="io.prediction" name="client" rev="0.8.3" />
         ...
     </dependencies>
     ...
@@ -49,7 +49,7 @@
 If you have an sbt project, add the library dependency to your build definition.
 
 ```Scala
-libraryDependencies += "io.prediction" % "client" % "0.8.2"
+libraryDependencies += "io.prediction" % "client" % "0.8.3"
 ```
 
 
@@ -95,7 +95,7 @@
         <dependency>
             <groupId>io.prediction</groupId>
             <artifactId>client</artifactId>
-            <version>0.8.3-SNAPSHOT</version>
+            <version>0.8.4-SNAPSHOT</version>
         </dependency>
     </dependencies>
     ...
diff --git a/client/pom.xml b/client/pom.xml
index 18a237b..d0b2b41 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -5,7 +5,7 @@
     <groupId>io.prediction</groupId>
     <artifactId>sdk</artifactId>
     <relativePath>../pom.xml</relativePath>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
   </parent>
 
   <artifactId>client</artifactId>
diff --git a/client/src/main/java/io/prediction/APIResponse.java b/client/src/main/java/io/prediction/APIResponse.java
index 5b5a259..380b6d4 100644
--- a/client/src/main/java/io/prediction/APIResponse.java
+++ b/client/src/main/java/io/prediction/APIResponse.java
@@ -4,7 +4,7 @@
  * API Response class for wrapping responses.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.2
  */
 
diff --git a/client/src/main/java/io/prediction/BaseClient.java b/client/src/main/java/io/prediction/BaseClient.java
index 5306294..80f87a8 100644
--- a/client/src/main/java/io/prediction/BaseClient.java
+++ b/client/src/main/java/io/prediction/BaseClient.java
@@ -19,7 +19,7 @@
  * BaseClient contains code common to both {@link EventClient} and {@link EngineClient}.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.1
  */
 public abstract class BaseClient implements Closeable {
diff --git a/client/src/main/java/io/prediction/DateTimeAdapter.java b/client/src/main/java/io/prediction/DateTimeAdapter.java
index 8886078..12eb1f3 100644
--- a/client/src/main/java/io/prediction/DateTimeAdapter.java
+++ b/client/src/main/java/io/prediction/DateTimeAdapter.java
@@ -16,7 +16,7 @@
  * DateTimeAdapter turns a String in ISO 8601 format into a DateTime object, and vice versa.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.8.0
  */
 public class DateTimeAdapter implements JsonSerializer<DateTime>, JsonDeserializer<DateTime> {
diff --git a/client/src/main/java/io/prediction/EngineClient.java b/client/src/main/java/io/prediction/EngineClient.java
index 9d09f25..dd1d625 100644
--- a/client/src/main/java/io/prediction/EngineClient.java
+++ b/client/src/main/java/io/prediction/EngineClient.java
@@ -17,7 +17,7 @@
  * for sending queries.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.8.0
  */
 public class EngineClient extends BaseClient {
diff --git a/client/src/main/java/io/prediction/Event.java b/client/src/main/java/io/prediction/Event.java
index 93ce34f..cf16151 100644
--- a/client/src/main/java/io/prediction/Event.java
+++ b/client/src/main/java/io/prediction/Event.java
@@ -14,7 +14,7 @@
  * Event class for PredictionIO Event objects.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.8.0
  */
 
diff --git a/client/src/main/java/io/prediction/EventClient.java b/client/src/main/java/io/prediction/EventClient.java
index 1d3af69..8086328 100644
--- a/client/src/main/java/io/prediction/EventClient.java
+++ b/client/src/main/java/io/prediction/EventClient.java
@@ -18,14 +18,14 @@
 /**
  * EventClient contains the generic methods createEvent() and getEvent() for importing and
  * accessing events, as well as helper methods such as setUser(), unsetItem() and userActionItem()
- * for integrating with built-in engines. Methods with an "AsFuture" suffix are asynchronous.
+ * for convenience. Methods with an "AsFuture" suffix are asynchronous.
  * <p>
  * Multiple simultaneous asynchronous requests is made possible by the high performance backend
  * provided by the <a href="https://github.com/AsyncHttpClient/async-http-client">Async Http Client</a>.
  *
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.8.0
  */
 public class EventClient extends BaseClient {
@@ -203,11 +203,11 @@
         }
     }
 
-    //////////////////////////////////////////////////
+    ////////////////////////////////////
     //
-    //  helper methods for use with built-in engines
+    //  helper methods for convenience
     //
-    //////////////////////////////////////////////////
+    ////////////////////////////////////
 
     /**
      * Sends a set user properties request. Implicitly creates the user if it's not already there.
@@ -222,7 +222,7 @@
             DateTime eventTime) throws IOException {
         return createEventAsFuture(new Event()
             .event("$set")
-            .entityType("pio_user")
+            .entityType("user")
             .entityId(uid)
             .eventTime(eventTime)
             .properties(properties));
@@ -281,7 +281,7 @@
         }
         return createEventAsFuture(new Event()
             .event("$unset")
-            .entityType("pio_user")
+            .entityType("user")
             .entityId(uid)
             .eventTime(eventTime)
             .properties(propertiesMap));
@@ -331,7 +331,7 @@
             throws IOException {
         return createEventAsFuture(new Event()
             .event("$delete")
-            .entityType("pio_user")
+            .entityType("user")
             .entityId(uid)
             .eventTime(eventTime));
     }
@@ -383,7 +383,7 @@
             DateTime eventTime) throws IOException {
         return createEventAsFuture(new Event()
             .event("$set")
-            .entityType("pio_item")
+            .entityType("item")
             .entityId(iid)
             .eventTime(eventTime)
             .properties(properties));
@@ -443,7 +443,7 @@
         }
         return createEventAsFuture(new Event()
             .event("$unset")
-            .entityType("pio_item")
+            .entityType("item")
             .entityId(iid)
             .eventTime(eventTime)
             .properties(propertiesMap));
@@ -493,7 +493,7 @@
             throws IOException {
         return createEventAsFuture(new Event()
             .event("$delete")
-            .entityType("pio_item")
+            .entityType("item")
             .entityId(iid)
             .eventTime(eventTime));
     }
@@ -544,9 +544,9 @@
             Map<String, Object> properties, DateTime eventTime) throws IOException {
         return createEventAsFuture(new Event()
             .event(action)
-            .entityType("pio_user")
+            .entityType("user")
             .entityId(uid)
-            .targetEntityType("pio_item")
+            .targetEntityType("item")
             .targetEntityId(iid)
             .properties(properties)
             .eventTime(eventTime));
diff --git a/client/src/main/java/io/prediction/FutureAPIResponse.java b/client/src/main/java/io/prediction/FutureAPIResponse.java
index 6163f71..cdd48c6 100644
--- a/client/src/main/java/io/prediction/FutureAPIResponse.java
+++ b/client/src/main/java/io/prediction/FutureAPIResponse.java
@@ -13,7 +13,7 @@
  * APIResponse as a listenable future.
  *
  * @author The PredictionIO Team (<a href="http://prediction.io">http://prediction.io</a>)
- * @version 0.8.2
+ * @version 0.8.3
  * @since 0.2
  */
 
diff --git a/examples/import/pom.xml b/examples/import/pom.xml
index c57b476..9f6bd49 100644
--- a/examples/import/pom.xml
+++ b/examples/import/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.prediction.samples</groupId>
     <artifactId>sample-import</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
     <packaging>jar</packaging>
     <name>PredictionIO Java SDK Examples: Import</name>
 
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>io.prediction</groupId>
             <artifactId>client</artifactId>
-            <version>0.8.2</version>
+            <version>0.8.3</version>
         </dependency>
     </dependencies>
 
diff --git a/examples/quickstart_import/pom.xml b/examples/quickstart_import/pom.xml
index e355e65..e7f0755 100644
--- a/examples/quickstart_import/pom.xml
+++ b/examples/quickstart_import/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.prediction.samples</groupId>
     <artifactId>quickstart-import</artifactId>
-    <version>0.8.2</version>
+    <version>0.8.3</version>
     <packaging>jar</packaging>
     <name>PredictionIO Java SDK Examples: Quickstart Import</name>
 
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>io.prediction</groupId>
             <artifactId>client</artifactId>
-            <version>0.8.2</version>
+            <version>0.8.3</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index b4b3f2e..b4693b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.prediction</groupId>
   <artifactId>sdk</artifactId>
-  <version>0.8.2</version>
+  <version>0.8.3</version>
   <url>http://prediction.io</url>
   <packaging>pom</packaging>
   <name>PredictionIO Java SDK</name>