fixed /server
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/rmb938/bungee/base/listeners/PlayerListener.java
space for galert