Merged PlayerTurnState

Merged mine with Chris's, should work but I have problems with the draw
item menu in Battlestate so I haven't been able to test Chris's part.