Kalender Demo
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/frontend/index.html
Merge branch 'dev' of https://github.com/redliontom/ProjectHub into dev

Conflicts:
	app/frontend/index.html
	app/frontend/templates/calendar.html
Merge branch 'dev' of https://github.com/redliontom/ProjectHub into dev