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
	src/main/java/com/sk89q/worldedit/commands/SchematicCommands.java
	src/main/java/com/sk89q/worldedit/regions/Polygonal2DRegionSelector.java