Merge branch 'master' of https://github.com/PaperSpigot/PaperSpigot

Conflicts:
	CraftBukkit
	README.md
Upstream merge