Merge upstream/master into development

Conflicts:
	src/main/java/com/worldcretornica/plotme_core/PlotMapInfo.java
	src/main/java/com/worldcretornica/plotme_core/PlotMe_Core.java
	src/main/java/com/worldcretornica/plotme_core/SqlManager.java
	src/main/java/com/worldcretornica/plotme_core/event/PlotMeEventFactory.java
	src/main/java/com/worldcretornica/plotme_core/listener/PlotListener.java