fixed conflict
Merge branch 'master' into ui

Conflicts:
	apps/frontend/templates/_dashboard_header.php
	data/sql/schema.sql
Always show the dashboard if login
Temp commit for exam/compute
more updates on teacher sides
Merge branch 'ui'
Merge branch 'daison-updates'