lists of jobs/students/faculty/employers added to schools/company pages
fixed conflict and Merge remote-tracking branch 'upstream/master'

Conflicts:
	collections/companies.js