Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
preview
Merge branch 'jack' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	views/index.ejs
	views/main.ejs
预览和url购买
remove check button
Merge branch 'preview' into dev
添加验证
添加def.area
添加右键和选择屏蔽
区域修复
删除console.log
修正ecs属性配置
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
修正ecs预览的价格计算
删除备注和查看
添加README
Merge branch 'dev'
参赛前merge
fix readme
添加统计代码
修复画布拓展导致的画布预览问题