chore(client): merge latest from superdesk core
chore(client): merge latest from superdesk core

verifiedpixel/superdesk,verifiedpixel/superdesk,verifiedpixel/superdesk,verifiedpixel/superdesk,verifiedpixel/superdesk