Merge branch '490-livedesk-embed-refactoring' of dev.sourcefabric.org:superdesk into 490-livedesk-embed-refactoring
Merge branch '35-media-archive-ui' of dev.sourcefabric.org:superdesk into 35-media-archive-ui

Conflicts:
	plugins/media-archive-image/gui-resources/scripts/js/media-archive/list-view.js
	plugins/media-archive-video/gui-resources/scripts/js/media-archive/grid-view.js
	plugins/media-archive-video/gui-resources/scripts/js/media-archive/list-view.js
	plugins/media-archive/gui-resources/scripts/js/list.js
	plugins/media-archive/gui-resources/scripts/js/models/meta-type.js
	plugins/media-archive/gui-resources/templates/list.dust
Merge branch 'master' of dev.sourcefabric.org:superdesk
Merge branch '35-media-archive-ui' of dev.sourcefabric.org:superdesk into 35-media-archive-ui
Merge branch 'devel' of dev.sourcefabric.org:superdesk into devel
35
35
Updated the install file
NR-504 : searching for users favirites does not return anything

Fixed
NR-468 : put a 'enter a twitter username' as a placeholder for searches

Chenged the error messages to show more consistency
Changes
Egg info files updates
NR-471 : Pagination support in REST
Merge branch '417-pagination-support-in-rest-structure' into devel
Added livedesk-embed

plugin for superdesk
NR-471: Pagination support in REST

Increased limit to 15
Change the source.sh
Livedesk embed

Added styles
Base templates added

Google item rendered.
More scroll
NR-490 : LivedeskEmbed -> refactoring

Added templates for Twitter, Flickr, Youtube, Google