add more info into welcome email template

add more info into welcome email template including physical address,
website address, & contact email address
Merge branch 'refs/heads/welcome' into ci

Conflicts:
	crm/themes/inspire/email-welcome.tpl.php