Conflicts: circle/dashboard/static/dashboard/dashboard.js circle/dashboard/static/dashboard/disk-list.js circle/dashboard/static/dashboard/group-details.js circle/dashboard/static/dashboard/node-details.js circle/dashboard/static/dashboard/node-list.js circle/dashboard/static/dashboard/vm-details.js circle/dashboard/static/dashboard/vm-tour.js circle/dashboard/templates/dashboard/base.html circle/dashboard/templates/dashboard/index-nodes.html circle/dashboard/templates/dashboard/vm-detail.html
