Merge branch 'master' of github.com:apptentive/apptentive-android

Move change to javadoc in Apptentive.java from old location to new location.

apptentive/src/main/java/com/apptentive/android/sdk/Apptentive.java

@@ -658,7 +658,7 @@ public static boolean canShowMessageCenter() {
 	 * if the app calls this method to set up a custom listener, the apptentive unread message badge, also an UnreadMessagesListener,
 	 * won't get notification. Please use {@link #addUnreadMessagesListener(UnreadMessagesListener)} instead.
 	 *
-	 * @param listener An UnreadMessageListener that you instantiate. Pass null to remove existing listener.
+	 * @param listener An UnreadMessagesListener that you instantiate. Pass null to remove existing listener.
 	 *                  Do not pass in an anonymous class, such as setUnreadMessagesListener(new UnreadMessagesListener() {...}).
 	 *                 Instead, create your listener as an instance variable and pass that in. This
 	 *                 allows us to keep a weak reference to avoid memory leaks.
@@ -673,7 +673,7 @@ public static void setUnreadMessagesListener(UnreadMessagesListener listener) {
 	/**
 	 * Add a listener to be notified when the number of unread messages in the Message Center changes.
 	 *
-	 * @param listener An UnreadMessageListener that you instantiate. Do not pass in an anonymous class.
+	 * @param listener An UnreadMessagesListener that you instantiate. Do not pass in an anonymous class.
 	 *                 Instead, create your listener as an instance variable and pass that in. This
 	 *                 allows us to keep a weak reference to avoid memory leaks.
 	 */

docs/migrating_to_2.0.0.md

@@ -18,4 +18,8 @@ We have also changed the way that you set your customer's name and email. The ne
 
 ## Unread Messages Listener
 
-We've modified how you pass in an `UnreadMessagesListener` when you want to be notified that the number of messages waiting to be read by your customer has changed. You should replace your calls to the deprecated `setUnreadMessagesListener()` with the new `addUnreadMessagesListener()`.
+We've modified how you pass in an `UnreadMessagesListener` when you want to be notified that the number of messages waiting to be read by your customer has changed. You should replace your calls to the deprecated `setUnreadMessagesListener()` with the new `addUnreadMessagesListener()`.
+
+## Manifest file
+
+We have removed Apptentive's NetworkStateReceiver from sdk. Please make sure remove `<receiver android:name="com.apptentive.android.sdk.comm.NetworkStateReceiver"> ... </receiver>` from your manifest.