my changes
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/update_scripts/threaded_scripts/import_threaded.py
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
not tracked
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/lib/music.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Correct bad link in animelist and fix side menus
Merge pull request #856 from sinfuljosh/master

Minor Corrections to update.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/themes/alpha/styles/bootstrap.min.css
Limit the amount of releases in cover view to 20 a page
Add new line at end of file
Merge pull request #857 from sinfuljosh/master

Limit the amount of releases in cover view to 20 a page
not tracked
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/lib/namecleaning.php
Clean up releases more, bug in search query, change by junkman690 for rss.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge pull request #859 from nZEDb/master

Update.
Some regex for a.b.town