fix bug
Finish Release-1

Conflicts:
	js/Chart.js