Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.js
修正删除bug
层复制没有记录size
Merge branch 'fixdel' into dev
Merge branch 'fixcopylayer' into dev
fix 复制新层的时候底角位置没有重置
Merge branch 'fixcornerpos' into dev
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev
fix预览图片的bug
Merge branch 'fixtoimg' into dev
fix图片预览问题
Merge branch 'fixpreviewimg' into dev
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into newui

Conflicts:
	public/javascripts/index.js
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
Merge branch 'merge' into dev
修复合并的冲突