Avatar no longer poisoned when eating berry
Fix a bug in FightScene
Merge branch 'master' of https://github.com/wanze/GameDevProject