cleanup
Merge remote-tracking branch 'evdo/master'

Conflicts:
	database.php