Merge remote-tracking branch 'sk89q/master'

Conflicts:
	pom.xml
	src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java