added battle api
TH-9 | merge conflicts
Merge remote-tracking branch 'origin/dev1.0' into dev1.0