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