Articuno and Porygon
Merge pull request #922 from LightAdept/master

Porygon and Articuno texture fix
new magneton i forgot
Disabling articuno until i can fix
Merge remote-tracking branch 'origin/master'
Merge pull request #932 from LightAdept/master

Fix to magneton (his new model added) and disabling articuno
fixes to helicopter arms and moltres wings lopsided
Merge remote-tracking branch 'origin/master'
Merge pull request #936 from LightAdept/master

Fixes
added player to eventFired
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
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
Added events for pokemon captured, wildpokemon beaten and riding a pokemon
added register to pokedex on trade
added a clearing function for when a player enters a world
Refactoring suggestions for Experience.java

Feel free to change code style back. If anything, consider the new variable names and comments. Pointing out where EV training item EXP is not rewarded in comments.