Levere timeliste
Merge branch 'master' of https://github.com/andrh/Sundvollen

Conflicts:
	app/index.html