Switched to PHP's mysqli extension.
Merge branch 'ent'

Conflicts:
	include/database.php