merge board_2048 test from develop with client server