have documents / ShareDocs service use name and user_id when possible
Merge branch 'multipleEmail' of github.com:sharewave/frontus into multipleEmail

Conflicts:
	cmn/services.js
	documents/js/controllers/companyDocumentList.js
Merge branch 'multipleEmail' of github.com:sharewave/frontus into multipleEmail
small changes
Merge branch 'multipleEmail' into testing