Fixed Industrial Mine not giving +1 iron.
Added a few more diplomatic text strings.

Not save-game compatible.

A hotfix in the caravansary thanks to mariverabe's efforts.
Watercourse now grants +1 food per 10 citizens rather than 5 citizens.
Infirmary now grants +1 food per 5 citizens rather than 4 citizens.
Arms Depot grants +1 science and Service Academy grants +2 science.
Instruction Center now grants +1 science per 10 citizens, and -1 gold per 5 citizens rather than 5 citizens and 4 citizens vice versa.
Educational Institute now grants +1 science per 6 citizens rather than 7 citizens.
Temple Upgrades now provide +1 faith to their respective corresponding religious buildings rather than +2 faith.
Chemist no longer provides +1 science per 5 citizens.
Industrial Mine now provides +2 coal and +1 iron rather than +3 coal.
Alchemist's building cost reduced.
Policy buildings' costs significantly reduced.
Added more diplomatic texts.
Fixed diplomatic text mistakes.

What's with the building upgrade merges? Since this is a merge for CBP features, there has been too many buildings that helps the policy tree of Progress significantly.
Merged the benefits from the upgrades of wall and castle together into a new building: Fortress.
Merged the benefits from the upgrades of arsenal and military base together into a new building: Military Camp.
Merged the benefits from the upgrades of library and university together into a new building: Instruction Center.
Merged the benefits from the upgrades of aqueduct and granary together into a new building: Watercourse.
Merged the benefits from the upgrades of harbor and lighthouse together into a new building: Dock.
Merged the benefits from the upgrades of caravansary and market together into a new building: Flea Market.
Merged the benefits from the upgrades of public school and research lab into a new building: Educational Institute
Removed the workshop upgrade.
Military Academy Upgrade now provides +20 XP instead of 15.
Amphitheater, Opera House, and Museum Upgrade no longer provide specialist slots, but rather +2 GPP respectively instead.
Amphitheater Upgrade now provides +1 culture for every 10 citizens, Opera House Upgrade provides +1 culture for every 8 citizens.


On a separate news:
Blacksmith now produces +1 production per 5 citizens.
Chemist now produces +1 science per 5 citizens.
General Store now produces +1 food per 6 citizens.

Fixed National Population issue.

Library Upgrade provides +2 science, Aqueduct Upgrade provides +2 food.
Unified SQL in the Building Upgrade Section for faster loading.
Fixed English tooltip.

Not save game compatible.

Fixed everything for the 3-12 update in the Community Balance Patch.