Manually updating versions.
Updating Changelog.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	nzedb/build/nZEDb.xml