Fixing patch versions. Removing unneeded country table rename.

Conflicts:
	nzedb/build/nZEDb.xml
	resources/db/patches/mysql/2014_03_26_1_schema.sql
	resources/db/schema/mysql-data.sql
Merge branch 'master' into next-master

Conflicts:
	nzedb/build/nZEDb.xml
Fixing transposed data in 10-content.tsv
Merge pull request #1261 from nZEDb/next-master

Next master