Fix Conversion2 changing type to Fairy in Gen5
Also totally remove Steel and Dark from the typechart of Gen1
Add XY Battle Spot Special format
Fix Mat Block
Merge pull request #464 from Slayer95/master

Fix Conversion2 changing type to Fairy in Gen5
Quick Guard and Wide Guard are now spammable

They will not fail if used in succession
Merge pull request #465 from V4Victini/guard

Quick Guard and Wide Guard are now spammable
Quick Guard blocks all priority moves

Even ones with artificially enhanced priority
Merge pull request #466 from V4Victini/guard

Quick Guard blocks all priority moves
Properly block priority moves with Quick Guard
Merge pull request #467 from V4Victini/guard

Properly block priority moves with Quick Guard
Wide Guard should not increment the Protect Counter
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/E4Arsh/Pokemon-Showdown