Updating tmux monitor.php and start.php to use Settings class instead of separate DB and Sites classes.
Changing all $db to $pdo, oops.
Fixing occurrence of $site I missed.
Replacing usage of DB() and Sites() with Settings, which uses less memory.
Oops, missed a couple of Sites().
Fixing missed or typoed $pdo.
More typoed $pdo
Adding magic method to Settings to treat non-existent fields as simple settings.
Fixing bad isset checks.
Changing occurrences of site class in smarty files.
Adding occurrence of site class missed in smarty files.
Fixing $page->pdo to $page->settings.
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Replacing BasePage use of Sites with Settings. This should be semantically identical for smarty to use.
Fixing $page->pdo-> to $page->settings->
Merge branch 'dev-db' of github.com:niel/nZEDb into dev-db

Conflicts:
	misc/update/nix/tmux/bin/safe_pull.php
	nzedb/build/nZEDb.xml
	nzedb/controllers/Binaries.php
	nzedb/controllers/Groups.php
	nzedb/controllers/Releases.php
	nzedb/controllers/RequestID.php
	nzedb/controllers/SABnzbd.php
	nzedb/controllers/Sites.php
	www/admin/site-stats.php
	www/index.php
	www/pages/AdminPage.php
	www/pages/BasePage.php
	www/pages/ajax_profile.php
	www/pages/api.php
	www/pages/contact-us.php
	www/pages/forgottenpassword.php
	www/pages/getnzb.php
	www/pages/queue.php
	www/pages/register.php
	www/pages/rss.php
	www/pages/sitemap.php
	www/pages/terms-and-conditions.php
Fixing lost use statement due to bad merge.
Fixing $page->pdo in templates