拖放到画布
Merge branch 'jack' into dev

Conflicts:
	public/stylesheets/index.css
	views/index.ejs