Better idToObject conversion for work.collabs.user, work.annotations.updated_by and work.media
Work.collabs.users: events and access
Accept user objects for work.collabs.users
jshint fixes
Merge branch 'master' into work-collaborators

Conflicts:
	frontend/lib/api/respond.js
Merge branch 'work-collaborators'
Cleanup after previous merge