Upstream merge, lots of conflicts

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

CraftBukkit-Patches/0061-Remove-OS-X-Special-Chars-from-Signs.patch

@@ -0,0 +1,21 @@
+From 5a3944c0a289434760d2e5448640423518e6810b Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sun, 8 Dec 2013 16:52:42 +1100
+Subject: [PATCH] Remove OS X Special Chars from Signs
+
+
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index 99ce73e..c7e40fe 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
++++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -1582,6 +1582,7 @@ public class PlayerConnection implements PacketPlayInListener {
+ 
+             for (j = 0; j < 4; ++j) {
+                 boolean flag = true;
++                packetplayinupdatesign.f()[j] = packetplayinupdatesign.f()[j].replaceAll( "\uF700", "" ).replaceAll( "\uF701", "" ); // Spigot - Mac OSX sends weird chars
+ 
+                 if (packetplayinupdatesign.f()[j].length() > 15) {
+                     flag = false;
+-- 
+1.9.1
+