enabled promotion icons
Merge remote-tracking branch 'origin/stable' into new-features

Conflicts:
	Cin/Cin/Cin.civ5proj
v3.12 - Promotion Icons

- fixed duplicate CES_Stories.xml
- barbarian camps should now appear
v3.12 - version numbers
v3.13 - Armies
v3.13 - AI experience handicap
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
Armies & Research
Merge remote-tracking branch 'origin/stable' into new-features
Caravan cost
Scouts obsolete at Pikemen

Now that Scouts upgrade into Spearmen, they tend to obsolete quickly. Obsoleting at Pikemen (Metal Casting) allows the Scout -> Spearmen -> Pikemen line but allows you to build both scouts and spearmen through the early eras.
Unit upgrades cost 2 times production as intended

By skodkim. See https://github.com/skodkim/cep-bnw/commit/9b0e4244d0a204632ca31266238be60786a40955
Walls now have 25% conquestprop as intended

By skodkim. See
https://github.com/skodkim/cep-bnw/commit/56ba027d3326c7125f09d2f79041e67f39c63738
Removed resource requirements for certain units

Gatling gun, bazooka and machine gun. By skodkim. See
https://github.com/skodkim/cep-bnw/commit/d39d6fc9f0750bbf94656d6b88c853b44d9c4ca9
Reactivate FullMovesAfterAttack

Units with the Blitz and the Can Move after Attacking Promotions should
now have more than 1 movement points after attacking.
Various Handicap Modifications

Moved general tech and happiness bonuses into difficulty specific
sections. Fixed wonders being easier for the AI to build on lower
difficulties.
Remove UNIT_SPANISH_CONQUISTADOR_2

Removed code causing problems in CEL_End.sql
Modified AI Handicap Promotion

Reduced additional visibility, removed accelerated experience gain, and
added garrison bonus back. Made promotion invisible.
Merge pull request #155 from Thalassicus/stable

 Merge remote-tracking branch 'origin/stable' into new-features
Merge pull request #156 from Thalassicus/new-features

 Merge remote-tracking branch new-features into 'origin/stable'