Fixed soldier fall damage bug
Merging changes