Merge branch 'ThemeDB'
Merge branch 'master'

Conflicts:
	database.php
	include/header.php