Merge branch 'master' of D:\workspaceAndroidStudio\PokerTmp with conflicts.
fix TFHServerRoom.java

By.wind