removed unneeded imports
fixed unescaped query values in social links
Merge remote branch 'upstream/master'