merge master into game_logic
remove test file