Fix potions turning to water bottles, fix game not ending when one team is empty
Merge remote-tracking branch 'origin/master'