Index: ps/trunk/binaries/data/mods/public/art/actors/units/athenians/hero_healer_hippocrates.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/art/actors/units/athenians/hero_healer_hippocrates.xml
+++ ps/trunk/binaries/data/mods/public/art/actors/units/athenians/hero_healer_hippocrates.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant file="biped/base_healer_male.xml">
+      <mesh>skeletal/new/m_dress.dae</mesh>
+      <props>
+        <prop actor="props/units/heads/new/head_hele_healer.xml" attachpoint="head"/>
+        <prop actor="props/units/staff.xml" attachpoint="weapon_R"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="healer-robe-1">
+      <props>
+      </props>
+      <textures>
+        <texture file="skeletal/athen/philosopher_01.png" name="baseTex"/>
+        <texture file="default_norm.png" name="normTex"/>
+        <texture file="skeletal/athen/philosopher_01_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="biped/death_infantry.xml"/>
+  </group>
+  <material>player_trans_norm_spec.xml</material>
+</actor>
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/athen_prytaneion_hero_heal.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/athen_prytaneion_hero_heal.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/athen_prytaneion_hero_heal.json
@@ -0,0 +1,9 @@
+{
+	"type": "garrisonedUnits",
+	"affects": ["Hero"],
+	"modifications": [
+		{ "value": "Health/RegenRate", "add": 6 }
+	],
+	"auraName": "Officer Accommodation",
+	"auraDescription": "Garrisoned Heroes +6 health regeneration rate."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_1.json
@@ -0,0 +1,11 @@
+{
+	"type": "range",
+	"radius": 35,
+	"affects": ["Human"],
+	"modifications": [
+		{ "value": "Health/RegenRate", "add": 0.5 }
+	],
+	"auraName": "Regeneration",
+	"auraDescription": "Humans +0.5 health regeneration rate.",
+	"overlayIcon": "art/textures/ui/session/auras/heal.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_hippocrates_2.json
@@ -0,0 +1,12 @@
+{
+	"type": "range",
+	"radius": 35,
+	"affects": ["Healer"],
+	"affectedPlayers": ["MutualAlly"],
+	"modifications": [
+		{ "value": "Heal/Health", "add": 2.0 }
+	],
+	"auraName": "Medicine Father",
+	"auraDescription": "Own and Allied Healers +2 heal health.",
+	"overlayIcon": "art/textures/ui/session/auras/heal.png"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_iphicrates_1.json
@@ -1,12 +1,12 @@
 {
-	"type": "formation",
+	"type": "range",
+	"radius": 40,
 	"affects": ["Soldier"],
 	"modifications": [
-		{ "value": "Resistance/Entity/Damage/Hack", "add": 3 },
-		{ "value": "Resistance/Entity/Damage/Pierce", "add": 3 },
-		{ "value": "Resistance/Entity/Damage/Crush", "add": 3 },
-		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
+		{ "value": "Resistance/Entity/Damage/Hack", "add": 2 },
+		{ "value": "Resistance/Entity/Damage/Pierce", "add": 2 },
+		{ "value": "Resistance/Entity/Damage/Crush", "add": 2 }
 	],
 	"auraName": "Formation Reforms",
-	"auraDescription": "Soldiers in his formation +3 crush, hack, pierce resistance, +15% movement speed."
+	"auraDescription": "Soldiers +2 crush, hack, pierce resistance."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/athen_hero_themistocles_1.json
@@ -7,5 +7,5 @@
 		{ "value": "UnitMotion/WalkSpeed", "multiply": 1.15 }
 	],
 	"auraName": "Naval Preparation",
-	"auraDescription": "−50% metal cost, Ships −50% construction time, +15% move speed."
+	"auraDescription": "Ships −50% metal cost, construction time, and +15% movement speed."
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/arsenal_philon.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/arsenal_philon.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/arsenal_philon.json
@@ -0,0 +1,22 @@
+{
+	"genericName": "Arsenal of Philon",
+	"description": "The arsenal was mainly used as a warehouse for materials and instruments for the equipment of warships.",
+	"cost": {
+		"metal": 300,
+		"wood": 300
+	},
+	"supersedes": "ship_health",
+	"requirements": {
+		"all": [
+			{"tech": "phase_city"},
+			{"civ": "athen"}
+		]
+	},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "military_engineers.png",
+	"researchTime": 40,
+	"tooltip": "Warships +1 health/second self-repair rate.",
+	"modifications": [{ "value": "Health/RegenRate", "add": 1}],
+	"affects": ["Warship"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/delian_league.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/delian_league.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/civbonuses/delian_league.json
@@ -0,0 +1,16 @@
+{
+        "genericName": "Delian League",
+        "autoResearch": true,
+        "description": "Shortly after the great naval victories at Salamis and Mykale, the Greek city-states instituted the so-called Delian League in 478 BC, whose purpose was to push the Persians out of the Aegean region. The allied states contributed ships and money, while the Athenians offered their entire navy.",
+        "requirements": {
+                "any": [
+                        { "civ": "athen" }
+                ]
+        },
+        "icon": "trihemiolia.png",
+        "tooltip": "Ships construct 25% faster.",
+        "modifications": [
+                { "value": "Cost/BuildTime", "multiply": 0.75 }
+        ],
+        "affects": ["Ship"]
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/iphicratean_reforms.json
@@ -1,6 +1,6 @@
 {
 	"genericName": "Iphicratean Reforms",
-	"description": "Athenian gymnasium, docks and triremes can train Marines (Epibates Athenaikos) and Cretan Mercenary Archers (Toxotes Kretikos).",
+	"description": "Athenian gymnasium, docks and triremes can train Marines (Epibates Athenaikos).",
 	"cost": {
 		"food": 200,
 		"metal": 200
@@ -14,6 +14,6 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "helmet_corinthian_crest.png",
 	"researchTime": 30,
-	"tooltip": "Athenian Gymnasia, Docks and Triremes can train Marines and Cretan Mercenary Archers.",
+	"tooltip": "Athenian Gymnasia, Docks and Triremes can train Marines.",
 	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
 }
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/ostracism.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/ostracism.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/ostracism.json
@@ -0,0 +1,23 @@
+{
+	"genericName": "Ostracism",
+	"description": "In ancient Athens, ostracism was the process by which any citizen, including political leaders, could be expelled from the city-state for 10 years.",
+	"cost": {
+		"food": 300,
+		"metal": 300
+	},
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{ "civ": "athen" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "fist.png",
+	"researchTime": 60,
+	"tooltip": "Citizen soldiers +5% health, but Heroes −40% health.",
+	"modifications": [
+		{ "value": "Health/Max", "multiply": 1.05, "affects": "CitizenSoldier" },
+		{ "value": "Health/Max", "multiply": 0.6, "affects": "Hero" }
+	],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/pheidian_workshop.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/pheidian_workshop.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/pheidian_workshop.json
@@ -0,0 +1,23 @@
+{
+	"genericName": "Pheidian Workshop",
+	"description": "Pheidias was a Greek sculptor, painter and architect, who lived in the 5th century BC, and is commonly regarded as one of the greatest of all sculptors of Classical Greece: Phidias' Statue of Zeus at Olympia was one of the Seven Wonders of the Ancient World. Phidias designed the statues of the goddess Athena on the Athenian Acropolis, namely the Athena Parthenos inside the Parthenon and the Athena Promachos, a colossal bronze statue of Athena which stood between it and the Propylaea, a monumental gateway that served as the entrance to the Acropolis in Athens.",
+	"cost": {
+		"stone": 300
+	},
+	"requirements": {
+		"all": [
+			{"tech": "phase_town"}, 
+			{"civ": "athen"}
+		]
+	},
+	"requirementsTooltip": "Unlocked in Town Phase.",
+	"icon": "vestals.png",
+	"researchTime": 40,
+	"tooltip": "Temples and Wonder −50% stone cost and build time.",
+	"modifications": [
+		{ "value": "Cost/BuildTime", "multiply": 0.5},
+		{ "value": "Cost/Resources/stone", "multiply": 0.5}
+	],
+	"affects": ["Temple", "Wonder"],
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/dock.xml
@@ -14,10 +14,14 @@
   <Obstruction>
     <Static width="22.0" depth="26.0"/>
   </Obstruction>
+  <Researcher>
+    <Technologies datatype="tokens">
+      arsenal_philon
+    </Technologies>
+  </Researcher>
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/infantry_marine_archer_b
       units/{civ}/champion_marine
     </Entities>
   </Trainer>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/gymnasium.xml
@@ -56,7 +56,6 @@
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/infantry_marine_archer_b
       units/{civ}/champion_marine
       units/{civ}/champion_infantry
       units/{civ}/champion_ranged
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/prytaneion.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_special">
+  <Auras datatype="tokens">
+    structures/athen_prytaneion_hero_heal
+  </Auras>
   <BuildRestrictions>
     <Category>Council</Category>
   </BuildRestrictions>
@@ -37,6 +40,7 @@
   <Researcher>
     <Technologies datatype="tokens">
       long_walls
+      ostracism
     </Technologies>
   </Researcher>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/temple.xml
@@ -11,6 +11,11 @@
   <Obstruction>
     <Static width="17.5" depth="27"/>
   </Obstruction>
+  <Trainer>
+    <Entities datatype="tokens">
+      units/{civ}/hero_hippocrates
+    </Entities>
+  </Trainer>
   <VisualActor>
     <Actor>structures/athenians/temple.xml</Actor>
     <FoundationActor>structures/fndn_5x7_temple.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_hippocrates.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_hippocrates.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/hero_hippocrates.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_hero_healer">
+  <Auras datatype="tokens">
+    units/heroes/athen_hero_hippocrates_1
+    units/heroes/athen_hero_hippocrates_2
+  </Auras>
+  <Health>
+    <Max>600</Max>
+  </Health>
+  <Identity>
+    <Civ>athen</Civ>
+    <GenericName>Hippocrates</GenericName>
+    <SpecificName>Hippocrates</SpecificName>
+    <Icon>units/athen/hero_hippocrates.png</Icon>
+    <Requirements>
+      <Techs datatype="tokens">-phase_city phase_town</Techs>
+    </Requirements>
+  </Identity>
+  <VisualActor>
+    <Actor>units/athenians/hero_healer_hippocrates.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_a.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_archer_b">
+  <Identity>
+    <Rank>Advanced</Rank>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen/infantry_archer_e</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_b.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="civ/athen|merc_inf|template_unit_infantry_ranged_archer">
+  <Identity>
+    <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
+    <GenericName>Cretan Mercenary Archer</GenericName>
+    <SpecificName>Toxótēs Krētikós</SpecificName>
+    <Icon>units/mace/infantry_archer.png</Icon>
+    <Requirements>
+      <Techs datatype="tokens">phase_town</Techs>
+    </Requirements>
+  </Identity>
+  <Promotion>
+    <Entity>units/athen/infantry_archer_a</Entity>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_e.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_archer_e.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/athen/infantry_archer_a">
+  <Identity>
+    <Rank>Elite</Rank>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/athenians/infantry_archer_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_e.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_e.xml
@@ -3,7 +3,9 @@
   <Identity>
     <Rank>Elite</Rank>
   </Identity>
-  <Promotion disable=""/>
+  <Promotion>
+    <Entity>units/athen/champion_infantry</Entity>
+  </Promotion>
   <VisualActor>
     <Actor>units/athenians/infantry_spearman_e.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/ship_trireme.xml
@@ -13,7 +13,6 @@
   <Trainer>
     <BatchTimeModifier>0.7</BatchTimeModifier>
     <Entities datatype="tokens">
-      units/{civ}/infantry_marine_archer_b
       units/{civ}/champion_marine
     </Entities>
   </Trainer>