Bug fixes

Fixed issue with not loading all generals
Amended navigate2 comments to include fail case
Changed guild battle to go back to keep if missing attack button