la til masse boilerplate kode
Merge branch 'master' of github.com:kentandersen/uu-app

Conflicts:
	src/js/router.js