Merge branch 'Refactoring'

Conflicts:
	.gitignore
	src/main/java/com/worldcretornica/plotme_core/PMCommand.java
	src/main/java/com/worldcretornica/plotme_core/PlayerList.java
	src/main/java/com/worldcretornica/plotme_core/Plot.java
	src/main/java/com/worldcretornica/plotme_core/PlotMeCoreManager.java
	src/main/java/com/worldcretornica/plotme_core/SqlManager.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdAuction.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBid.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBiome.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdComments.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdCreateWorld.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdInfo.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdResetExpired.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSell.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSetOwner.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdShowHelp.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotDenyListener.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotListener.java
	src/main/java/com/worldcretornica/plotme_core/worldedit/PlotWorldEdit5_7.java
	src/main/resources/caption-english.yml
Merge remote-tracking branch 'origin/master' into Refactoring2

Conflicts:
	.gitignore
	src/main/java/com/worldcretornica/plotme_core/PMCommand.java
	src/main/java/com/worldcretornica/plotme_core/PlayerList.java
	src/main/java/com/worldcretornica/plotme_core/Plot.java
	src/main/java/com/worldcretornica/plotme_core/PlotMeCoreManager.java
	src/main/java/com/worldcretornica/plotme_core/SqlManager.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdAuction.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBid.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBiome.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdComments.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdCreateWorld.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdInfo.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdResetExpired.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSell.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSetOwner.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdShowHelp.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotDenyListener.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotListener.java
	src/main/java/com/worldcretornica/plotme_core/worldedit/PlotWorldEdit5_7.java
	src/main/resources/caption-english.yml
Merge branch 'master' into Refactoring2

Conflicts:
	.gitignore
	src/main/java/com/worldcretornica/plotme_core/PMCommand.java
	src/main/java/com/worldcretornica/plotme_core/PlayerList.java
	src/main/java/com/worldcretornica/plotme_core/Plot.java
	src/main/java/com/worldcretornica/plotme_core/PlotMeCoreManager.java
	src/main/java/com/worldcretornica/plotme_core/SqlManager.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdAuction.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBid.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdBiome.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdComments.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdCreateWorld.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdInfo.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdResetExpired.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSell.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdSetOwner.java
	src/main/java/com/worldcretornica/plotme_core/commands/CmdShowHelp.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotDenyListener.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotListener.java
	src/main/java/com/worldcretornica/plotme_core/worldedit/PlotWorldEdit5_7.java
	src/main/resources/caption-english.yml
NullPointerException?
Merge branch 'refactoring'