Merge branch 'master' into ui
minor updates on templates
done with student examination ui, and exam questionnaires rendering and ui
Merge branch 'ui'

Conflicts:
	apps/frontend/modules/subjects/actions/actions.class.php