Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
disable Facebook options

going to try the sep plugin, need to disable our own Facebook tags
Merge branch 'dev'

Conflicts:
	wp-content/themes/workhorse/functions.php
delete Facebook tags
Merge branch 'dev'
Merge branch 'dev'
Profile links fixes and top nag text-indent
Merge branch 'homepage' into dev
Merge branch 'dev'
update email contacts
updated instagram link
Tj bio update