commit before merge
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/testing/Bulk_import_linux/nzb-import-bulk.php
	www/lib/books.php
	www/lib/console.php
	www/lib/music.php
	www/lib/namefixer.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
merged