fix api issues

Conflicts:
	Changelog
	nzedb/build/nZEDb.xml