clean up the logic on the people sidebars

related to changes for #273
Merge branch 'bert' into testing

Conflicts:
	company/profile/CompanyProfileApp.js