Fix to spawning with super flat worlds
Fix to crash on using a pokeball in battle
Zubat Y Fix
MORE random stuff. Touched golem while testing Y Fix
Merge branch 'master' of https://www.github.com/MrMasochism/Pixelmon.git

Conflicts:
	minecraft/pixelmon/database/DatabaseHelper.java