Fix: re-added site-edit requestid max hours setting that somehow got removed
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev
Using var as an array, not object.
Fix typo in sitemap.php causing the page to not load.
Don't show login at bottom of alpha theme if user is logged in.
Hide ads on alpha theme if they are disabled.
Separating definition and data from MySQl and PostgreSQL schema files.
Merge branch 'dev-db' into dev

Conflicts:
	Changelog
	resources/db/schema/pgsql-data.sql
	resources/db/schema/pgsql.sql
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev

Conflicts:
	Changelog
	_build/nZEDb.xml
Updating versions file.
Merge pull request #3 from nZEDb/dev

Dev