Merge branch 'hotfix'
Added option to enter email address or url to any contact page for the email icon
Merge branch 'hotfix' into develop