cleaned up layout & added website information
Merge remote-tracking branch 'origin/welcome' into ci

Conflicts:
	crm/config.sample.inc.php

Changes to be committed:

	modified:   crm/config.sample.inc.php
	modified:   crm/themes/inspire/email-welcome.tpl.php