兼容ipad
兼容 ipad
Merge branch 'ipad' of https://github.com/lln7777/zhuyun into ipad
兼容ipad画线
Merge branch 'modelui' of https://github.com/lvlx/zhuyun into newipad
Merge branch 'ipad' of https://github.com/lvlx/zhuyun into newipad
 newipad 兼容
登录不显示邮箱，只显示登出按钮。
层显示在画布上时，初始化名字为“未命名层”
兼容 ipad
预览slb
Merge branch 'modelui' of https://github.com/lln7777/zhuyun into merge
Merge branch 'ipad1' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	config/config.coffee
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.coffee
	public/javascripts/index.js
	public/stylesheets/index.css
Merge branch 'merge' into dev