Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	controller/student/testcharts.js
Merge origin/master

Conflicts:
	controller/student/testcharts.js
Merge origin/master

Conflicts:
	controller/student/testcharts.js
Merge origin/master

Conflicts:
	controller/student/testcharts.js