Fix some files to use the new class.
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev

Conflicts:
	nzedb/build/nZEDb.xml