More UI
Merge conflict

Merge branch 'master' of github.com:SwedishPensionsAgency/PrepPilot

Conflicts:
	global.R
	server.R