testmetacat
Merge branch 'master' of github.com:stefanvonderkrone/star-exec-presenter
Merge branch 'master' of github.com:stefanvonderkrone/star-exec-presenter

Conflicts:
	Application.hs
	config/routes
	star-exec-presenter.cabal
	templates/registered.hamlet
merge