Signed-off-by: jun <jun.gong@ccplay.com.cn>
Merge branch 'develop' of https://github.com/killuavx/game_center into develop

Conflicts:
	webservice/fontend-static/cc_web/html/temp-index.html

Signed-off-by: jun <jun.gong@ccplay.com.cn>