Update Bukkit for Minecraft 1.6.2
Merge branch 'master' of https://github.com/Bukkit/Bukkit into master-spigot

Conflicts:
	pom.xml
Merge branch 'master-spigot' into 1.6-spigot

Conflicts:
	pom.xml