restore end turn button functionality

turns out the AI ends it's turn in a lot more places than i thought.
Merge remote-tracking branch 'upstream/master'