Deleting wrongly named file.
Fixing duplicate key constraint error, introduced by recent change to 2014-04-03 countries patch.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml
Manually updating versions.