NR-54 : Gateway (security) component

media archive added
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel
NR 582 : Solr based search for Integrated Asset Repository
NR-582 : Solr based search for Integrated Asset Repository
NR 582 : Solr based search for Integrated Asset Repository - supports all features as sql based search, refactored to be able to select search provider from config file
NR 582 : Solr based search for Integrated Asset Repository - supports all features as sql based search, refactored to be able to select search provider from config file
NR 582 : Solr based search for Integrated Asset Repository

supports all features as sql based search, refactored to be able to select search provider from config file
NR-609 : Add Solr Facet support on plugin
Merge branch '582-Solr-based-search-for-Integrated-Asset-Repository' of dev.sourcefabric.org:superdesk into 582-Solr-based-search-for-Integrated-Asset-Repository

Conflicts:
	plugins/media-archive-audio/superdesk/media_archive/impl/audio_data.py
	plugins/media-archive-audio/superdesk/media_archive/impl/audio_info.py
	plugins/media-archive-audio/superdesk/media_archive/impl/audio_persist.py
	plugins/media-archive-image/superdesk/media_archive/impl/image_data.py
	plugins/media-archive-image/superdesk/media_archive/impl/image_info.py
	plugins/media-archive-image/superdesk/media_archive/impl/image_persist.py
	plugins/media-archive-video/superdesk/media_archive/impl/video_data.py
	plugins/media-archive-video/superdesk/media_archive/impl/video_persist.py
	plugins/media-archive/__plugin__/media_archive/service.py
	plugins/media-archive/superdesk/media_archive/core/impl/solr_search.py
	plugins/media-archive/superdesk/media_archive/impl/meta_data.py
	plugins/media-archive/superdesk/media_archive/impl/meta_info.py
NR-609 : Add Solr Facet support on plugin
Corect after rebase with devel
Merge branch '582-Solr-based-search-for-Integrated-Asset-Repository' of dev.sourcefabric.org:superdesk into 582-Solr-based-search-for-Integrated-Asset-Repository

Conflicts:
	plugins/media-archive/__plugin__/media_archive/actions.py
	plugins/media-archive/__plugin__/media_archive/service.py