Merge branch 'master' into feature-pipeline
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/static/dashboard/vm-details.js circle/dashboard/templates/base.html circle/dashboard/templates/dashboard/index-vm.html
Showing
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/static/dashboard/vm-details.js circle/dashboard/templates/base.html circle/dashboard/templates/dashboard/index-vm.html