Merge branch 'citizen' of https://github.com/sourcefabric/Superdesk into citizen-sms

Conflicts:
	plugins/livedesk/livedesk/impl/comment.py
Merge branch 'citizen' of https://github.com/sourcefabric/Superdesk into citizen-sms
Merge branch 'citizen' of https://github.com/sourcefabric/Superdesk into citizen-sms
Merge branch 'citizen' of https://github.com/sourcefabric/Superdesk into citizen-sms
LB-1159: As an editor, I want to hide SMS posts

Initial commit
Merge branch 'citizen' of https://github.com/sourcefabric/Superdesk into citizen-sms

Conflicts:
	plugins/livedesk/livedesk/impl/comment.py
LB-1159: As an editor, I want to hide SMS posts

Done
Merge pull request #430 from vladnicoara/citizen-sms

LB-1159: As an editor, I want to hide SMS posts