Add Glyphicons for social media
merge conflict fixed