Fixed dashboard/views.py
Fixed templates/dashboard/dashboard.html to its nonbroken form
Finishing merge