Updated contact logic
Merge branch 'master' of https://github.com/rhinocoders/website

Conflicts:
	assets/resources/lib/functions.php