Prevent team shuffle on end of map vote

If random teams had already been passed before.
Fixed map vote changing map early

If a vote changed the next map after an extension vote, the extension
time would be ignored.
Fixed badges being lost after class change
Merge pull request #102 from Person8880/develop

Needs more badges.