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

Conflicts:
	pom.xml
	src/main/java/net/minecraft/server/BlockCactus.java
	src/main/java/net/minecraft/server/BlockCrops.java
	src/main/java/net/minecraft/server/BlockMushroom.java
	src/main/java/net/minecraft/server/BlockReed.java
	src/main/java/net/minecraft/server/BlockSapling.java
	src/main/java/net/minecraft/server/BlockStem.java
	src/main/java/net/minecraft/server/Chunk.java
	src/main/java/net/minecraft/server/ChunkRegionLoader.java
	src/main/java/net/minecraft/server/DedicatedServer.java
	src/main/java/net/minecraft/server/Entity.java
	src/main/java/net/minecraft/server/EntityFallingBlock.java
	src/main/java/net/minecraft/server/EntityItem.java
	src/main/java/net/minecraft/server/EntityTracker.java
	src/main/java/net/minecraft/server/Explosion.java
	src/main/java/net/minecraft/server/MinecraftServer.java
	src/main/java/net/minecraft/server/Packet2Handshake.java
	src/main/java/net/minecraft/server/Packet51MapChunk.java
	src/main/java/net/minecraft/server/Packet56MapChunkBulk.java
	src/main/java/net/minecraft/server/PendingConnection.java
	src/main/java/net/minecraft/server/PlayerConnection.java
	src/main/java/net/minecraft/server/PlayerInteractManager.java
	src/main/java/net/minecraft/server/PlayerList.java
	src/main/java/net/minecraft/server/SpawnerCreature.java
	src/main/java/net/minecraft/server/ThreadLoginVerifier.java
	src/main/java/net/minecraft/server/TileEntity.java
	src/main/java/net/minecraft/server/World.java
	src/main/java/net/minecraft/server/WorldServer.java
	src/main/java/org/bukkit/craftbukkit/CraftServer.java
	src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
	src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
	src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
	src/main/java/org/bukkit/craftbukkit/util/LongHashSet.java
	src/main/java/org/bukkit/craftbukkit/util/LongObjectHashMap.java
	src/main/java/org/spigotmc/MultiplexingServerConnection.java
	src/main/java/org/spigotmc/RestartCommand.java
	src/main/java/org/spigotmc/WatchdogThread.java
	src/main/java/org/spigotmc/netty/CipherBase.java
	src/main/java/org/spigotmc/netty/CipherDecoder.java
	src/main/java/org/spigotmc/netty/CipherEncoder.java
	src/main/java/org/spigotmc/netty/NettyNetworkManager.java
	src/main/java/org/spigotmc/netty/NettyServerConnection.java
	src/main/java/org/spigotmc/netty/NettySocketAdaptor.java
	src/main/java/org/spigotmc/netty/OutboundManager.java
	src/main/java/org/spigotmc/netty/PacketDecoder.java
	src/main/java/org/spigotmc/netty/PacketEncoder.java
	src/main/java/org/spigotmc/netty/PacketListener.java
	src/main/java/org/spigotmc/netty/ReadState.java