From cd325ebbb633b0dafea1ba9dcbd3371543bc5a4b Mon Sep 17 00:00:00 2001
From: Barry Li <barry@apptentive.com>
Date: Mon, 21 Mar 2016 15:49:28 -0700
Subject: [PATCH] ANDROID-605 Release 2.1.4

---
 CHANGELOG.md                                               | 7 +++++++
 README.md                                                  | 2 +-
 apptentive/AndroidManifest.xml                             | 4 ++--
 apptentive/gradle.properties                               | 2 +-
 .../src/com/apptentive/android/sdk/util/Constants.java     | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dab8bcefa..d950b5dd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 2016-03-22 - 2.1.4
+
+#### Bug Fixed and Improvements
+
+*   All Apptentive resources now have "apptentive_" prefix
+*   Apptentive Log class is renamed to "ApptentiveLog" 
+
 # 2016-01-22 - 2.1.3
 
 #### Bug Fixed and Improvements
diff --git a/README.md b/README.md
index 415288e66..8a2cba1fc 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ use your app, to talk to them at the right time, and in the right way.
 
 ##### Version history is tracked [here](CHANGELOG.md)
 
-##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|2.1.3|aar)
+##### Binary releases are hosted for Maven [here](http://search.maven.org/#artifactdetails|com.apptentive|apptentive-android|2.1.4|aar)
 #### Reporting Bugs
 
 We encourage you to help us find and fix bugs. If you find a bug, please fill in the contributor agreement, then open a [github issue](https://github.com/apptentive/apptentive-android/issues?direction=desc&sort=created&state=open).
diff --git a/apptentive/AndroidManifest.xml b/apptentive/AndroidManifest.xml
index 611853171..e9201ae5a 100644
--- a/apptentive/AndroidManifest.xml
+++ b/apptentive/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.apptentive.android.sdk"
-          android:versionCode="34"
-          android:versionName="2.1.3">
+          android:versionCode="35"
+          android:versionName="2.1.4">
     <uses-sdk android:minSdkVersion="11"/>
 </manifest>
diff --git a/apptentive/gradle.properties b/apptentive/gradle.properties
index a71e7b1ff..5e5a0ea01 100644
--- a/apptentive/gradle.properties
+++ b/apptentive/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=2.1.3
+VERSION_NAME=2.1.4
 POM_NAME=Apptentive Android SDK
 POM_ARTIFACT_ID=apptentive-android
 POM_PACKAGING=aar
\ No newline at end of file
diff --git a/apptentive/src/com/apptentive/android/sdk/util/Constants.java b/apptentive/src/com/apptentive/android/sdk/util/Constants.java
index 6698737cc..b994f0649 100644
--- a/apptentive/src/com/apptentive/android/sdk/util/Constants.java
+++ b/apptentive/src/com/apptentive/android/sdk/util/Constants.java
@@ -11,7 +11,7 @@
  */
 public class Constants {
 
-	public static final String APPTENTIVE_SDK_VERSION = "2.1.3";
+	public static final String APPTENTIVE_SDK_VERSION = "2.1.4";
 
 
 	public static final int REQUEST_CODE_PHOTO_FROM_SYSTEM_PICKER = 1000;