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

Conflicts:
	pom.xml
	src/main/java/net/minecraft/server/Entity.java
	src/main/java/net/minecraft/server/HandshakeListener.java
	src/main/java/net/minecraft/server/MobSpawnerAbstract.java
	src/main/java/net/minecraft/server/NetworkManager.java
	src/main/java/net/minecraft/server/StructureGenerator.java
	src/main/java/org/bukkit/craftbukkit/CraftServer.java
	src/main/java/org/bukkit/craftbukkit/CraftWorld.java
	src/main/java/org/bukkit/craftbukkit/command/TicksPerSecondCommand.java
	src/main/java/org/spigotmc/AntiXray.java
	src/main/java/org/spigotmc/RestartCommand.java
	src/main/java/org/spigotmc/SpigotConfig.java
	src/main/java/org/spigotmc/SpigotWorldConfig.java
	src/main/java/org/spigotmc/WatchdogThread.java