Changed order of game states to prepare for new auxiliary logic
Changed BMGame->update_game_state_* logic to match newly reordered BMGameStates
Reordered test cases in BMGameTest to match changes in BMGameState