bug fix
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/testing/Dev_testing/export_settings.php