模板的组件和层的名字保留用户设置的名字
no change
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into improve1

Conflicts:
	public/javascripts/funcs.coffee
delete <<<
恢复样式
从模版新建的架构，ecs配置有问题
Oss名字限制为英文  登录时不判断密码长度
丰富登录提示
调整公共模板的弹出位置
调整公共模板的弹出位置
 Merge branch 'ipad1' of https://github.com/lln7777/zhuyun into improve1

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/home.coffee
	public/javascripts/home.js
	views/index.ejs
fix 模板不能画线的bug
Merge branch 'improve2' of https://github.com/lln7777/zhuyun into improve1
Merge branch 'improve1' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	public/javascripts/funcs.js