Fixing battle system

1. Fix recruit part of algorithm for merging parties.
2. Make algorithm respect max party size as  a limitator of battle size.
3. Display in battle header the teams appropriately.