fixed gameserver.java
Merge origin/master