feat(views) - show filtered items for a view, SD-550
changed creator into version_creator and added behave test
fix(links): set resource titles for lock/unlock
SD-560 : REST API for display the content of a View

Changed the content url 0f the content_view to content_view/<content
view id>/items
Add support to combine the saved filter additional filter received from
client
feat(views) - show filtered items for a view, SD-550
SD-560 : REST API for display the content of a View

Changed the content url 0f the content_view to content_view/<content
view id>/items
Add support to combine the saved filter additional filter received from
client
Merge branch 'master' of https://github.com/ioanpocol/superdesk-server

Conflicts:
	features/coverage.feature
	features/steps/steps.py
	superdesk/archive/__init__.py
Show filtered items for a view, SD-550

Moved json related methods in a different file
fix(lock): make it work with reuters guid
SD-577 - upload image urls return an error
SD-560 - REST API for display the content of a View

Samll improvement on query clause merging
Merge remote-tracking branch 'anca/itemsBranch'
Merge remote-tracking branch 'ioan/master'
Merge remote-tracking branch 'ioan/sd-577'
fix(views): set resource_title for content view items
feat(notification): push notification via websockets

it implements broadcast over websocket instead of clients pulling
introduce honcho to run the app
fix(unlock): write behave tests

SD-563 : Content forced unlocking
SD-605 : Add the option to specify how the _self link is generated archive/ingest items that appear on content view

Add the option to specifiy a custom self generation
Added behave tests for this and changing the way the lists are checked
on behave tests. Fixed some old behave tests that used lists checks.
SD-605 : Add the option to specify how the _self link is generated

Add custom self for user_content