lchen59, paulkim6 : fix battle activity to have db
Merge branch 'master' into US15