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
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/themes/alpha/styles/bootstrap.min.css
not tracked
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/lib/namecleaning.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
untracked
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/themes/Default/templates/frontend/content.tpl
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	www/pages/content.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev