Merge pull request #1 from pedropaG/master

Repair
Merge pull request #2 from pedropaG/master

Sync
Minor Changes while palying
Update ExtraDiplomacyText.sql
Merge pull request #11 from JairoAlonso25/master

Merging changes