Merge pull request #705 from LightAdept/master

Mostly fixes and trainers
re-added bellsprout
Merge remote-tracking branch 'remotes/origin/master'
fix to golems eye
fixed bellsprout
Merge remote-tracking branch 'origin/master'

Conflicts:
	minecraft/pixelmon/client/models/PixelmonModelRenderer.java
Poliwhirl added. New skeleton for Limbless Pokemon called Serpent.
Various Bug fixes