fixed a few more bugs/typos
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/update_scripts/nix_scripts/tmux/monitor.php
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	misc/update_scripts/nix_scripts/tmux/monitor.php