Merge branch 'devel' of github.com:superdesk/superdesk-client into devel

Conflicts:
	app/scripts/superdesk-users/directives.js