Merge remote-tracking branch 'origin/master'

Conflicts:
	config/commands.js
	config/formats.js

Trainer Card Fixes
.
Merge branch 'master' of https://github.com/jd4565/Pokemon-Showdown