nothing to change

thanks
Merge remote-tracking branch 'origin/master'

Conflicts:
	Chart/barTest.js