Merge branch 'master' into teachers

Conflicts:
	app/Config/core.php
