Updated for Gathering Storm patch.
Added French translations by kevblackwel.

Fixed an exploit that allowed buying the reward buildings with negative faith (they will still show as available to buy, but with a faith amount so high it is not feasible to buy them).

Update 5/24/2018:
Jamsetji Tata (1839-1904) was moved to the industrial era.

Added 3 new merchants:
Lizzie Magie (Modern Era) - Gives boardgames, +4 amenities
David Sarnoff (Modern Era) - Builds NBC, a wonder that provides +5 gold to the city it is built in, and an amenity to all cities within 10 tiles.
Raymond Rubicam (Atomic Era) - The commercial hub gives culture equal to it's adjacency bonus, adds a trade route, and increases the tourism modifier of trade routes by 25%.