fix infinite scroll on the company document list page to trigger individually on the 2 lists (probably overly agressively loads now)
Merge branch 'master' into bert
fix typo in setting docpanel height
Merge branch 'bert' into testing

Conflicts:
	documents/js/controllers/companyDocumentList.js