some fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	cg2-a01/bezier_curve.js
some fixes