tussendoor commit
Merge branch 'master' of https://github.com/sverro2/WEBS3

Conflicts:
	public/css/calendarstyle.css