Merge remote-tracking branch 'origin/master'

Conflicts:
	app.io.js
draw the point on the screen.
Merge remote-tracking branch 'origin/master'