Update welcome mail template
Merge branch 'arnes-customisation' into arnes-devel