session for test working
Merge origin/master
session for test working
Merge origin/master

Conflicts:
	view/student/test_result.php