Merge branch 'next-master'

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml

Renaming data files for tables after table rename. Oops

Merge branch 'next-master'

Merge branch 'next-master'

Merge branch 'next-master'

fix screen/threaded/start.sh script

Fix ambiguous condition check.

Merge branch 'next-master'

Updating Changelog.

Merge branch 'next-master'