Testing of my merge errors
After merge
Further merge tests

This is to see the file in the Master repo
removed the test file
Merge remote-tracking branch 'origin/master' into ExpiredReign
Minuteman fixes

commented out all unitclass changes
Fixed Soldier units from costing only 1 production

HLOOKUP formula in column AA of 'Units' tab in CEP_ArmiesCities
incorrectly set the 1st cell of the array as $G$2 instead of $F$2 thus
'soldier' was never referenced.
Extra 's' from UNITCLASS_MARINE in CEA_End removed.
Changed CEP_GALLEY back to BIREME.
Minor Leader edits

Austrian Promotions placed under Assyria.
Indian War Elephant change redundant, Indian & Eygptian UB changed to
match all other types.
Siam's region avoidance removed.
Spain' trait applied to Songhai mistakenly.
Barbary Port TXT now points to the correct place.
Further minor edits

Enabled free embarkation for Carthage.
Directed the TXT for Hanseatic League to correct location.
Removed duplicate trait for India.
Corrected some inaccuracies in the leader trait's descriptions.
Sweden and France edits

Minor fix of Sweden's Allotment (no strength bonus given just yet).
France's UA still an older TXT applied to it.
XML based way to remove buildings from the pedia

Thanks to "lockstep" & "Irkalla"
Duplications in the database

Removed (commented out) duplicate TXT_KEYs. Usually the topmost ones, I
figured you just entered new ones at the bottom.
v3.4 - merge