Merge some stuff from upstream.

By: md_5 <git@md-5.net>

CraftBukkit-Patches/0055-Implement-respawn-API.patch

@@ -1,14 +1,14 @@
-From 0ad400b8b6a6fc0e35b79f725fafc98c4aec1746 Mon Sep 17 00:00:00 2001
+From 062f40ae66aa1e8d5c3b3884cc75036a670c9c7f Mon Sep 17 00:00:00 2001
 From: ninja- <xninja@openmailbox.org>
 Date: Tue, 8 Oct 2013 14:34:49 +0200
 Subject: [PATCH] Implement respawn API.
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6903d41..48be84e 100644
+index df6569a..b96c27a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1271,6 +1271,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              getHandle().collidesWithEntities = collides;
              getHandle().k = collides; // First boolean of Entity
          }
@@ -25,5 +25,5 @@ index 6903d41..48be84e 100644
  
      public Player.Spigot spigot()
 -- 
-1.8.5.2.msysgit.0
+1.8.3.2