School Fixes: Teacher dashboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/includes/menu.php