Updated WorldEdit

Merged Larry1123s master
Conflicts:
	src/canarymod/java/com/sk89q/worldedit/canarymod/CanaryPlayer.java