enabled promotion icons
v3.12 - Promotion Icons

- fixed duplicate CES_Stories.xml
- barbarian camps should now appear
v3.12 - version numbers
v3.12 - fixes
v3.12.1 - fixes

- Consulates should not instantly set resting influence.
- Colonization should give new cities 5 pop.
- Discipline should increase great general speed.
- Fixed barbarian camp inconsistency.
v3.12.1 - fixes

- Carthage starting units
- Scientific Revolution science buildings
Update Policies.sql

Simple spelling mistake.
Updated the spreadsheet also.
Fixes

Axmen unit class
Individual vs global cost consistency
Unit names
Ottoman trait
Ottoman fix, and version update
Possible civilopedia crash avoidance
fix civilopedia crash in xml as well #112
Merge pull request #113 from saulshanabrook/patch-1

fix civilopedia crash in xml as well #112
Revert of merge
Ethiopia fix
Leader fixes

England, Sweden, Barbary Port
Citystate capture fix
Debug text clarification
Version update
Merge remote-tracking branch 'origin/stable' into new-features

Conflicts:
	Cat/Cat/AI/CEAI_FixTables.lua
	Cat/Cat/Cat.civ5proj
	Ceg/Ceg/Armies/CEA__Start.sql
	Ceg/Ceg/Barbarians/CEB_End.sql
	Ceg/Ceg/Ceg.civ5proj
	Ceg/Ceg/Cities/CEC_Civilians.xml
	Cin/Cin/Cin.civ5proj
	Cin/Cin/Interface/FlagPromotions/FP_Data.sql