Tidy up and move one file to nZEDb_LIBS
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
	_build/nZEDb.xml
Manual updating of versions file