variable name fix, welcome.xhtml fix
Merge branch 'develop' of https://github.com/jonasberglund/skrubb_DAT076 into develop