Update Mega Heracross and Mega Medicham tiers
Merge remote-tracking branch 'upstream/master'