[Gameplay] - Merge wonder population auras.

Since wonders already have many bonuses by default.
This merges the two population auras to one that increases the
population cap after researching the technology and instead of flat +50,
it now is relative: +20%.

Patch by: @Nescio
Differential revision: D2951
Reviewed by: @Palaxin
Comments by: @badosu, @borg-,
Reservations by: @bb, @Freagarach
This was SVN commit r24692.

binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_1.json

@@ -1,10 +0,0 @@
-{
-	"type": "player",
-	"affects": ["Player"],
-	"modifications": [
-		{ "value": "Player/MaxPopulation", "add": 10 }
-	],
-	"auraName": "Symbol of Greatness",
-	"auraDescription": "+10 maximum population limit.",
-	"stackable": true
-}

binaries/data/mods/public/simulation/data/auras/structures/wonder_pop_2.json

@@ -1,11 +0,0 @@
-{
-	"type": "player",
-	"affects": ["Player"],
-	"modifications": [
-		{ "value": "Player/MaxPopulation", "add": 40 }
-	],
-	"auraName": "Glorious Expansion",
-	"auraDescription": "+40 maximum population limit (requires the “Glorious Expansion” technology).",
-	"requiredTechnology": "pop_wonder",
-	"stackable": true
-}

binaries/data/mods/public/simulation/data/auras/structures/wonder_population_cap.json

@@ -0,0 +1,11 @@
+{
+	"type": "player",
+	"affects": ["Player"],
+	"modifications": [
+		{ "value": "Player/MaxPopulation", "multiply": 1.2 }
+	],
+	"auraName": "Glorious Expansion",
+	"auraDescription": "+20% maximum population limit (requires the “Glorious Expansion” technology).",
+	"requiredTechnology": "wonder_population_cap",
+	"stackable": true
+}

binaries/data/mods/public/simulation/data/technologies/wonder_population_cap.json

@@ -18,6 +18,6 @@
 	"requirementsTooltip": "Unlocked in City Phase.",
 	"icon": "special_treasure.png",
 	"researchTime": 120,
-	"tooltip": "Enable the “Glorious Expansion” aura: +40 maximum population limit per Wonder owned.",
+	"tooltip": "Enable the “Glorious Expansion” aura: +20% maximum population limit per Wonder owned.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }

binaries/data/mods/public/simulation/templates/template_structure_wonder.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
   <Auras datatype="tokens">
-    structures/wonder_pop_1
-    structures/wonder_pop_2
+    structures/wonder_population_cap
   </Auras>
   <BuildRestrictions>
     <Category>Wonder</Category>
@@ -54,7 +53,7 @@
   </Obstruction>
   <ProductionQueue>
     <Technologies datatype="tokens">
-      pop_wonder
+      wonder_population_cap
     </Technologies>
   </ProductionQueue>
   <Resistance>