add some modif for battle
Merge branch 'master' of https://github.com/quentinR/picktr