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 branch 'dev' into next-master

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
	resources/db/schema/data/10-content.tsv
Merge branch 'master' into next-master

Conflicts:
	resources/db/patches/mysql/2014_04_03_3_countries.sql
Removing renamed file
Manually updating versions.
Merge pull request #1280 from nZEDb/next-master

Read the Changelog
Merge branch 'dev' into next-master

Conflicts:
	nzedb/build/nZEDb.xml
	nzedb/controllers/Binaries.php
	nzedb/controllers/CollectionsCleaning.php
Fixing the annoying exceptions when running patches.

Conflicts:
	nzedb/build/nZEDb.xml
Merge branch 'master' of github.com:nZEDb/nZEDb
Fixing typo in default path for tmpunrarpath.

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml
Manually updating versions.
Manually updating versions.
Fixed badly quoted entry in menu.tsv
Fixed badly quoted entry in menu.tsv
Merge branch 'dev' into next-master

Conflicts:
	nzedb/build/nZEDb.xml
	resources/db/schema/data/10-settings.tsv
Changing patch 208 to completely drop the anidb table , avoiding all the failed drop PRIMARY errors preventing the rest from running.

Conflicts:
	nzedb/build/nZEDb.xml
Changing patch 208 to completely drop the anidb table , avoiding all the failed drop PRIMARY errors preventing the rest from running.

Conflicts:
	nzedb/build/nZEDb.xml

Conflicts:
	nzedb/build/nZEDb.xml
Cherry-picking regex fix.
Adding new constant for the path regex used in DbUpdate.

Conflicts:
	nzedb/build/nZEDb.xml
Adding new constant for the path regex used in DbUpdate.