did bunch of changes to the calendar, templates, and other stuff
Merge branch 'master' of https://github.com/SverigesRiksdag/intranetgui

Conflicts:
	dev/ui/js/templates.js