Merge pull request #922 from LightAdept/master

Porygon and Articuno texture fix
Merge remote-tracking branch 'origin/master'