Upstream merge + remove 3 pulled patches.

By: md_5 <md_5@live.com.au>

Bukkit-Patches/0013-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -0,0 +1,28 @@
+From 5d672b1aa92376a8e13540221f774f14ff96b2d7 Mon Sep 17 00:00:00 2001
+From: Alex Bennett <alex.eugene.bennett@gmail.com>
+Date: Thu, 11 Jul 2013 15:31:32 -0500
+Subject: [PATCH] Added getAllSessionData() to the Conversation API.
+
+
+diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java
+index 7a5b5ed..6b4bcac 100644
+--- a/src/main/java/org/bukkit/conversations/ConversationContext.java
++++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
+@@ -44,6 +44,14 @@ public class ConversationContext {
+     }
+ 
+     /**
++     * Gets the entire sessionData map.
++     * @return The full sessionData map.
++     */
++    public Map<Object, Object> getAllSessionData() {
++        return sessionData;
++    }
++
++    /**
+      * Gets session data shared between all {@link Prompt} invocations. Use this as a way
+      * to pass data through each Prompt as the conversation develops.
+      *
+-- 
+1.8.1.2
+