Merge branch 'dev' of github.com:nZEDb/nZEDb
Merge branch 'dev' of github.com:nZEDb/nZEDb
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge branch 'master' of github.com:nZEDb/nZEDb
Adding Regex support for a.b.sounds.flac
updated schema to match patch level
Updated threaded.sh to fix a few mistakes, some of the parameters for the scripts were incorrect.
Updated tmux.conf to display a better (IMHO) status bar at the bottom. It uses a bit less space and shows a bit more info.
Added update_scripts/actmon.php which is a stand-alone version of the tmux monitor.php script. It essentially displays all of the same data but is de-coupled from controlling any sort of tmux panels.
Updated threaded.sh to display a bit more info to the user, as well as changed the delay mechanism.
Merge pull request #883 from DejaVu/dev

Adding Regex support for a.b.sounds.flac
typo
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'master' of https://github.com/extide/nZEDb into dev

Conflicts:
	db/schema.mysql
	misc/update_scripts/nix_scripts/screen/sequential/threaded.sh