Grimer and the start of OBJ importation
Merge pull request #826 from LightAdept/master

Grimer and stuff
Merge pull request #827 from Hiroku/master

Move fixes all over the place, everything except Memento tested (no pokemon know memento yet I think)
Char-line fire particles
FlameParticle
Update AIFlying.java
Update AIHelper.java
Update EntityFlyingPixelmon.java
Merge pull request #831 from kengaboa/master

Added Flying AI
Improved structure finding.
Built preliminary object3D loader
Various fixes
Merge branch 'master' of https://github.com/MrMasochism/Pixelmon
added missing files
added disabled variable to Attack and to the moveset data packet
disabled flying ai till all the files are committed
Cleared out old LockedInBattle effect stuff for coming rewrite
Updated moves with database effect column importing to make more generic
code
Replaced setEntityHealth with attackEntityFrom, we missed that one
Added HealOther
Worked on disable stuff
Nothing really
Update Entity7HasAI.java