Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/templates/dashboard/index-nodes.html
Merge branch 'box-search' · 53386bcc