fixed fighting after opposing soldier dies issue
fixed fighting bug
Merge branch 'develop'