Merge branch 'master' of git://github.com/EcoCityCraft/Spigot-API

Conflicts:
	pom.xml
	src/main/java/org/bukkit/Effect.java
	src/main/java/org/bukkit/conversations/ConversationContext.java
	src/main/java/org/bukkit/util/StringUtil.java