updates to contact
Merge remote-tracking branch 'origin/master'

Conflicts:
	contact.php