fix连线在层内外区别的bug
内外网连线颜色区分，层属性配置。
层和rds属性配置
补充
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/funcs.coffee
	public/javascripts/index.coffee
	public/javascripts/index.js
	public/stylesheets/index.css
Merge branch 'merge' into dev
Merge branch 'dev' of https://github.com/lln7777/zhuyun into dev