Merge branch 'master' of C:\Users\dylan\PhpStormProjects\Dashboard-onderzoeksemester with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	dashboard/channeldashboard.php
removed switch statement cookie contains int number of days corresponding with day/week/month