Conflicts: circle/dashboard/templates/dashboard/vm-detail.html circle/dashboard/urls.py circle/dashboard/views.py
Merge branch 'master' into feature-template-wizard · a46d3f9c