Fix for browse page country flags.
Fixing older patch that doesn't need to rename the country table
Fixing step2 require_once.
Fixing patch versions. Removing unneeded country table rename.

Conflicts:
	nzedb/build/nZEDb.xml
	resources/db/schema/mysql-data.sql
Merging dev to dev
Manually updating versions