I forgot my changes.
Merge branch 'master' of https://github.com/educask/nightly

Conflicts:
	includes/classes/site.php