Pull Request for poetter/melee&animation but is only animation code no melee yet

Let me know asap if this ends up breaking develop because last time I ran this copy is ran fine.