画像
refactoring
travis pass
Merge branch 'master' into topic-background-image

Conflicts:
	lib/canvas/socket.js
	src/canvas/show.eco