Conflicts: circle/dashboard/templates/dashboard/template-list.html circle/dashboard/templates/dashboard/vm-detail/home.html circle/dashboard/views.py
