Many improvements to namings

Improved the way data gets input to Army creation

Added artillery pairing logic