updates
Merge branch 'master' into jeremy3

Conflicts:
	include/database.php