Pulling all pending Bukkit-JavaDoc changes

A special thanks goes to @aerouk for almost all of the changes found here.
[Bleeding] Correct naming of sounds for Minecraft 1.7. Fixes BUKKIT-5065

Several sounds were renamed in Minecraft 1.7 and have been updated
accordingly. Additionally, two sounds, HURT and BREATH, were removed from
Minecraft.
Add missed tree types for Minecraft 1.7. Adds BUKKIT-5042

The Minecraft 1.7 update added two new types of trees that weren't added
in the initial update to 1.7: MEGA_REDWOOD and TALL_BIRCH.

Pulled from PR #979
Specify MaterialData for Acacia and Dark Oak stairs. Fixes BUKKIT-5037

When Minecraft 1.7 was released, Acacia and Dark Oak Stairs were added.
While Bukkit added them to Material.java, it did not add the MaterialData
mapping of them to Stairs.class.

Currently getAscendingDirection() and other stair-specific functions can
not be used on these new stairs. This commit fixes that by adding the
mapping needed.

Pulled from PR #977
Add new setResourcePack method. Fixes BUKKIT-5015

Minecraft now uses resource packs instead of texture packs.

This commit adds a new method specific for resource packs, and deprecates
setTexturePack.
Updated version to 1.7.2-R0.1 in pom.xml for Beta.
Updated version to 1.7.2-R0.2-SNAPSHOT for development towards next release.
Merge branch 'master' of https://github.com/Bukkit/Bukkit into master-spigot

Conflicts:
	pom.xml
	src/main/java/org/bukkit/Effect.java
	src/main/java/org/bukkit/conversations/ConversationContext.java
apply latest Spigot-patches