name target added
fix battle model
fix server adapter + merged