Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master
Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master
Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master

Conflicts:
	view/student/test_result.php
Merge origin/master

Conflicts:
	controller/student/testcharts.js