Merge branch 'development' into permissions-ui

Conflicts:
	client/collection.coffee
	client/group.coffee
	client/lib/access.coffee
	client/lib/catalog.coffee
	client/lib/controls.coffee
	client/publication.coffee

Also renamed all e variables to event (see #375)