Add XY Battle Spot Singles

Essentially Gen 6 GBU
Missed comma
Merge remote-tracking branch 'upstream/master'
usergroups
Merge branch 'master' of https://github.com/ChampionOnyx/Pokemon-Showdown
Merge branch 'master' of https://github.com/ChampionOnyx/Pokemon-Showdown
avatars