Merge branch 'master' of git://github.com/EcoCityCraft/Spigot-Server

Conflicts:
	pom.xml
	src/main/java/net/minecraft/server/ChunkProviderServer.java
	src/main/java/net/minecraft/server/DedicatedServer.java
	src/main/java/net/minecraft/server/Entity.java
	src/main/java/net/minecraft/server/EntityItem.java
	src/main/java/net/minecraft/server/EntityLiving.java
	src/main/java/net/minecraft/server/EntityTrackerEntry.java
	src/main/java/net/minecraft/server/MinecraftServer.java
	src/main/java/net/minecraft/server/PendingConnection.java
	src/main/java/net/minecraft/server/PlayerConnection.java
	src/main/java/net/minecraft/server/PlayerList.java
	src/main/java/net/minecraft/server/World.java
	src/main/java/org/bukkit/craftbukkit/CraftServer.java
	src/main/java/org/bukkit/craftbukkit/CraftWorld.java
	src/main/java/org/bukkit/craftbukkit/OrebfuscatorManager.java
	src/main/java/org/bukkit/craftbukkit/Spigot.java
	src/main/java/org/spigotmc/netty/CipherCodec.java
	src/main/java/org/spigotmc/netty/NettyNetworkManager.java
	src/main/java/org/spigotmc/netty/NettyServerConnection.java
	src/main/resources/configurations/bukkit.yml