Merge pull request #517 from nistormihai/master

Citizen into master
LB-1243
:
List of the collaborators shows users that are already collaborators
Merge pull request #518 from nistormihai/master

LB-1163: As an editor, I want to filter posts on chained blog source by ...
LB-1243
:
List of the collaborators shows users that are already collaborators
LB-1243
:
List of the collaborators shows users that are already collaborators
Merge branch 'master' of github.com:ioanpocol/Superdesk

Conflicts:
	plugins/superdesk-user/superdesk/user/api/user.py
	plugins/superdesk-user/superdesk/user/impl/user.py
Merge pull request #519 from ioanpocol/master

    LB-1243 : List of the collaborators shows users that are already collaborators
LB-1155: Strange checkbox visual behavior

Fixed
Merge pull request #520 from vladnicoara/master

LB-1155: Strange checkbox visual behavior
LB-1243
:
List of the collaborators shows users that are already collaborators
Merge pull request #521 from ioanpocol/master

LB-1243
LB-1164: As an editor, I want to filter posts on the timeline by verification status and assigned user

Removed filter by type.
Merge pull request #522 from nistormihai/master-to-delete

LB-1164: As an editor, I want to filter posts on the timeline by verific...
LB-1272 On embed replace "updated on 14:50" with "updated at 14:50"
Merge pull request #523 from patriciagarcia/LB-1272

LB-1272 On embed replace "updated on 14:50" with "updated at 14:50"