Added 1.7 blocks and items.
Fixed some javadocs and deprecated isNaturalTerrainBlock(int).
Merge branch 'master' of git://github.com/sk89q/worldedit

Conflicts:
	src/main/java/com/sk89q/worldedit/blocks/BlockType.java
	src/main/java/com/sk89q/worldedit/blocks/ItemType.java