fix bugs
Merge branch 'master' of https://github.com/NickSocial/SocialWebsite

Conflicts:
	Social Website/Web/Controller/Companyhome/Companyhome.js