Fixing duplicate key constraint error, introduced by recent change to 2014-04-03 countries patch.

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
	resources/db/patches/mysql/2014-04-03_3_countries.sql
Merge pull request #515 from nZEDb/dev

Dev
Merge pull request #516 from nZEDb/dev

Dev
Merge pull request #517 from nZEDb/dev

Dev
Merge pull request #518 from nZEDb/dev

Dev
Merge pull request #519 from nZEDb/dev

Fixing typo (Chance => Change).
Merge pull request #520 from nZEDb/dev

Dev
Merge pull request #521 from nZEDb/dev

Add additional removecrap output and FT match string mods
Merge pull request #522 from nZEDb/dev

Dev
Merge pull request #523 from nZEDb/dev

Dev
Merge pull request #524 from nZEDb/dev

Dev
Merge pull request #525 from nZEDb/dev

Dev
Merge pull request #526 from nZEDb/dev

Less memory footprint on yEnc decode by reusing the same input variable ...
Merge pull request #527 from nZEDb/dev

Dev
Merge branch 'dev' into next-master

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
	resources/db/schema/data/10-content.tsv
Merge pull request #528 from nZEDb/dev

Dev
Merge pull request #529 from nZEDb/dev

Dev
Merge pull request #530 from nZEDb/dev

Dev
Merge pull request #531 from nZEDb/dev

Dev
Merge pull request #532 from nZEDb/dev

Dev