Merge pull request #1 from Pixelmon/master

merg
Merge pull request #2 from Pixelmon/master

merge
Merge pull request #3 from Pixelmon/master

Merge
Finishing adding Aron...
Merge pull request #41 from Rhonim/master

Finishing adding Aron...
Removed orbs/shrine more deliberately.
Merge branch 'master' of https://github.com/Pixelmon/Pixelmon
Merge pull request #42 from Xwaffle1/master

	Removed orbs/shrine more deliberately.
Beldum and Metang
Enums
Merge remote-tracking branch 'origin/master'
Merge pull request #43 from LightAdept/master

Beldum and Metang
fixed rotation points and scaling for beldum and metang
Merge pull request #4 from Pixelmon/master

Merge
made pokemon entity be created at pokeball impact rather than on throw to remove chance of duplicating held items
fixed crafting glitch after battle
Updated Serpent and Onix, added animation for Rayquaza.
Fixed Electrodes rotation point, added voltorb, fixed eeveelutions.
A little bit of clean up!
Added new Miltank