fix by Armando

1.- return of the troops after an attack in time of peace
2.- Fix catapults
Merge pull request #38 from armando1980/patch-10

fix catapults and attack in time of peace by Armando