Merge remote-tracking branch 'origin/master'
New growlithe, squirtle, small change to armaldo, and nidorina!
Merge remote-tracking branch 'origin/master'
Merge pull request #950 from LightAdept/master

Some more new models
Re-implemented proper fire stone spawning.  Added exception for spawn conditions for jungle spawns
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon