Merge branch '2.4.1(diffc)'

Conflicts:
	src/main/java/com/orange451/UltimateArena/Arenas/Arena.java
	src/main/java/com/orange451/UltimateArena/Arenas/CONQUESTArena.java
	src/main/java/com/orange451/UltimateArena/Arenas/CTFArena.java
	src/main/java/com/orange451/UltimateArena/Arenas/INFECTArena.java
	src/main/java/com/orange451/UltimateArena/Arenas/KOTHArena.java
	src/main/java/com/orange451/UltimateArena/Arenas/MOBArena.java
	src/main/java/com/orange451/UltimateArena/Arenas/Objects/ArenaConfig.java
	src/main/java/com/orange451/UltimateArena/Arenas/Objects/ArenaPlayer.java
	src/main/java/com/orange451/UltimateArena/Arenas/Objects/FlagBase.java
	src/main/java/com/orange451/UltimateArena/UltimateArena.java
	src/main/java/com/orange451/UltimateArena/testAPI.java