fix battle building
Merge branch 'master' of github.com:Kingboard/Kingboard