Merge branch 'master' into ting/game_page
fixed #area-play-center
Merge branch 'ting/game_page'