fixed the setting(company and personal)
Merge branch 'master' of https://github.com/NickSocial/SocialWebsite