Merge branch 'user' of https://github.com/lln7777/zhuyun into modelui
Merge branch 'user' of https://github.com/lln7777/zhuyun into modelui
Merge branch 'user' of https://github.com/lln7777/zhuyun into modelui
公共模板的存取，并展现在画布上。
 Merge branch 'dev' of https://github.com/lln7777/zhuyun into modelui

Conflicts:
	.gitignore
	public/javascripts/canvas.js
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/global.coffee
	public/javascripts/global.js
	public/javascripts/index.coffee
	public/javascripts/index.js
	views/main.ejs
保存按钮
Merge branch 'topbtn' of https://github.com/lln7777/zhuyun into merge
隐藏保存为公共模板按钮
Merge branch 'merge' into dev