Potential fix for hanging tmux monitor.php query (restart tmux session)
Additional categorization improvements
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into nZEDb-dev

Conflicts:
	nzedb/build/nZEDb.xml

damn merge conflict
Merge branch 'nZEDb-dev' into dev