1
Merge remote-tracking branch 'origin/master'

Conflicts:
	PocketMine-MP.php
	src/API/BanAPI.php
	src/API/BlockAPI.php
	src/API/ConsoleAPI.php
	src/API/EntityAPI.php
	src/API/PlayerAPI.php
	src/API/PluginAPI.php
	src/API/ServerAPI.php
	src/API/TileEntityAPI.php
	src/Async.php
	src/Player.php
	src/PocketMinecraftServer.php
	src/dependencies.php
	src/functions.php
	src/inventory/Window.php
	src/material/Block.php
	src/material/block/misc/Bed.php
	src/material/block/plant/Sapling.php
	src/material/item/generic/Painting.php
	src/network/MinecraftInterface.php
	src/network/Query.php
	src/network/UDPSocket.php
	src/pmf/Level.php
	src/pmf/PMF.php
	src/pmf/Plugin.php
	src/utils/Java.php
	src/utils/NBT.php
	src/utils/Spyc.php
	src/utils/Utils.php
	src/world/ChunkParser.php
	src/world/Entity.php
	src/world/Explosion.php
	src/world/TileEntity.php
	src/world/generator/Generator.class.php
	src/world/generator/object/tree/BigTreeObject.php
	src/world/generator/object/tree/PineTreeObject.php
	src/world/generator/object/tree/SmallTreeObject.php
	src/world/generator/object/tree/SpruceTreeObject.php