Merge origin/master

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

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