Pulling all pending Bukkit-JavaDoc changes
Merge branch 'master' of https://github.com/Bukkit/Bukkit