Merge branch 'master' of https://e.coding.net/shenyou-gfg/gfgclient/client

# Conflicts:
#	GameClient/Assets/ResIn/UI/Main/Main_fui.bytes