Updated dashboard urls to use pk instead of calendar_id arg
Merge remote-tracking branch 'origin/class-views' into class-views
Stupid merge fixes