Merge remote-tracking branch 'upstream/master'

Conflicts:
	commands.js
	config/commands.js
Merge branch 'master' of https://github.com/panpawn/Pokemon-Showdown

Conflicts:
	commands.js
	config/commands.js