trying again
Merge pull request #1 from nZEDb/dev

Bringing Current
Merge pull request #2 from nZEDb/dev

bring current.
Updated JQuery, Colorbox working, Qtip working
Merge pull request #489 from sinfuljosh/dev

Updated jquery, colorbox, qtip
Add nEwZNZB.wz.cz
Merge pull request #490 from nZEDb/dev

Dev
Make the buttons blend in.
Merge pull request #491 from nZEDb/dev

Make the buttons blend in.
Dev.
Merge pull request #492 from nZEDb/dev

Dev.
added dump db as option to mysqldump_tables.php
Merge pull request #495 from nZEDb/dev

added dump db as option to mysqldump_tables.php
Add error_log to ignore
Merge pull request #496 from sinfuljosh/dev

Add error_log to ignore
Merge pull request #497 from nZEDb/dev

Dev
tmux - added misc sorter (wip), split postprocessing into amazon and non-amazon
Merge pull request #499 from nZEDb/dev

tmux - added misc sorter (wip), split postprocessing into amazon and non...
Merge remote-tracking branch 'upstream/master'

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