ecs，rds属性配置
Merge branch 'newui' of https://github.com/lln7777/zhuyun into merge

Conflicts:
	public/javascripts/components.coffee
	public/javascripts/components.js
	public/javascripts/funcs.coffee
	public/javascripts/funcs.js
	public/javascripts/index.coffee
	public/javascripts/index.js
	views/index.ejs
Merge branch 'merge' into dev