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

Conflicts:
	pom.xml
	src/main/java/net/minecraft/server/Chunk.java
	src/main/java/net/minecraft/server/DedicatedServer.java
	src/main/java/net/minecraft/server/Entity.java
	src/main/java/net/minecraft/server/EntityArrow.java
	src/main/java/net/minecraft/server/EntityItem.java
	src/main/java/net/minecraft/server/EntityLiving.java
	src/main/java/net/minecraft/server/EntitySkeleton.java
	src/main/java/net/minecraft/server/ItemStack.java
	src/main/java/net/minecraft/server/LocaleLanguage.java
	src/main/java/net/minecraft/server/MinecraftServer.java
	src/main/java/net/minecraft/server/MobSpawnerAbstract.java
	src/main/java/net/minecraft/server/NextTickListEntry.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/Packet63WorldParticles.java
	src/main/java/net/minecraft/server/PendingConnection.java
	src/main/java/net/minecraft/server/PlayerChunk.java
	src/main/java/net/minecraft/server/PlayerConnection.java
	src/main/java/net/minecraft/server/SpawnerCreature.java
	src/main/java/net/minecraft/server/ThreadLoginVerifier.java
	src/main/java/net/minecraft/server/TileEntityHopper.java
	src/main/java/net/minecraft/server/WorldServer.java
	src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
	src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
	src/main/java/org/spigotmc/ActivationRange.java
	src/main/java/org/spigotmc/LogFilter.java
	src/main/java/org/spigotmc/RestartCommand.java
	src/main/java/org/spigotmc/SpigotConfig.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/PacketDecoder.java