Fix the patch.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	resources/db/patches/mysql/0232~settings.sql
Merge pull request #661 from nZEDb/dev

Dev
Merge remote-tracking branch 'origin/dev' into dev
Add avi extension to codec removal
Remove regex2
Add XXX category to codec poster removal
Add specific XXX categories
Updated the codec poster removal in ReleaseRemover.php. It might catch some legit releases.
Merge branch 'DariusIII-dev_codec' into dev