Merge pull request #352 from nZEDb/dev

Remove fixnames with names from screen, it's obsolete and causes the "presents" issue with release neames.
Merge pull request #353 from nZEDb/dev

Move them down.
added script to finish the conversion from nn+
fixing previous push
Merge branch 'master' into dev

Conflicts:
	misc/update_scripts/nix_scripts/tmux/monitor.php
Update simple.sh
Update simple.sh
still fixing bad push
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge pull request #360 from nZEDb/master

Master to dev
Adding what I have currently.
Forgot this.
Send some crap to books - other.
Merge pull request #2 from nZEDb/dev

Bringe Fork Up to Date