Update Social logins for Font Awesome 4.0 (Close #31)
Update social.html
Merge branch 'master' into dev
Merge branch 'master' into dev