Updated category search and tidied up the printouts in namefixer
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev

Bring it up to date with dev master
Updated Changelog - doh\!
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev

Conflicts:
	Changelog
Improved namefixer efficiency and avoided putting all a.b.moovee releases into SD
Updated Changelog correctly
Reverted testing ordering in category.php
Improved searching on nfos by changing if() ordering
Merge branch 'dev' of https://github.com/devmem/nZEDb into devmem-dev

Conflicts:
	Changelog
Update FAQ.txt
Update Changelog
updated schema for missing patches
Merge branch 'master' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
updates to ffmpeg samples
cleanup
Update releases.php
Update releases.php
fixed issue with postprocess threaded nfo
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev