y
y
y
y
nanzhu:bugfix
y
nanzhu:bugfix
Merge remote-tracking branch 'origin/interface' into interface

Conflicts:
	packages/dashboard/public/controllers/interface.js
	packages/dashboard/public/views/interface.html
	packages/dashboard/server/controllers/interfaces.js
处理冲突
Merge branch 'interface'
lanxi: grunt config
Merge branch 'interface'