Revert
Revert
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/communitysurvivalgames/thesurvivalgames/managers/ArenaManager.java
Revert