allow fb and twitter icons to be on every page
Merge branch 'master' into production