Merge pull request #676 from LightAdept/master

More Pokemon
Merge pull request #678 from LightAdept/master

Confused myself doing this somehow, but here you go!
Counter and Zubat (still working on)
added possible fix to crash when getting null back from databasePath
Merge remote-tracking branch 'remotes/origin/master'
Merge remote-tracking branch 'origin/master'
mareep can now be shorn
fix to nickname being set with name when added to the pc
fixed espeon crash
fossil cleaner now works
Merge remote-tracking branch 'origin/master'
Counter and added Zubat/Golbat Animations