Merge pull request #266 from nistormihai/lb-refactor-zeit

LB-851: Update css and add new theme on zeit.superdesk.pro instance
Merge pull request #268 from nistormihai/lb-refactor-zeit

added missing __init__.py
Update liveblog.css
Update liveblog.css
Update loader.js
LB-894: Twitter is not working because the proxy server is down

Provide sourcefabric cors proxy url.
Merge pull request #286 from petrjasek/set-twitter-proxy

Set twitter proxy
Merge remote-tracking branch 'sourcefabric/liveblog-15' into devel

Conflicts:
	plugins/livedesk-embed/gui-resources/scripts/js/concat.js
	plugins/livedesk-embed/gui-resources/scripts/js/concat.min.js
	plugins/livedesk-embed/gui-resources/scripts/js/plugins/user-comments-popup.js
	plugins/livedesk-embed/gui-themes/themes/default.js
	plugins/livedesk-embed/gui-themes/themes/default.min.js
	plugins/livedesk-embed/gui-themes/themes/stt.js
	plugins/livedesk-embed/gui-themes/themes/stt.min.js
	plugins/livedesk-embed/gui-themes/themes/stt/livedesk.css
	plugins/livedesk/__plugin__/livedesk/upgrade.py
	plugins/livedesk/gui-resources/scripts/js/providers/colabs.js
	plugins/livedesk/gui-resources/scripts/js/providers/comments.js
	plugins/livedesk/gui-resources/scripts/js/providers/twitter.js
Merge remote-tracking branch 'sourcefabric/lb-refactor-embed' into devel

Conflicts:
	plugins/livedesk-embed/__plugin__/livedesk_embed/populate.py
	plugins/livedesk-embed/build/build.bat
	plugins/livedesk-embed/build/core.js
	plugins/livedesk-embed/gui-resources/scripts/js/core.js
	plugins/livedesk-embed/gui-resources/scripts/js/core/require/tmpl.js
	plugins/livedesk-embed/gui-resources/scripts/js/loader.js
	plugins/livedesk-embed/gui-resources/scripts/js/main.js
	plugins/livedesk-embed/gui-resources/scripts/js/plugins/button-pagination.js
	plugins/livedesk-embed/gui-resources/scripts/js/plugins/pagination.js
	plugins/livedesk-embed/gui-resources/scripts/js/plugins/scroll-pagination.js
	plugins/livedesk-embed/gui-resources/scripts/js/views/blog.js
	plugins/livedesk-embed/gui-resources/scripts/js/views/post.js
	plugins/livedesk-embed/gui-resources/scripts/js/views/posts.js
	plugins/livedesk-embed/gui-resources/scripts/js/views/timeline.js
	plugins/livedesk-embed/gui-themes/themes/base/item/base.dust
	plugins/livedesk-embed/gui-themes/themes/base/item/posttype/wrapup.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/big_toggle.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/comment-icon-bottom.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/comment-icon.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/comment-icon2.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/dots32.gif
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/facebook-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/favorites.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/flickr-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/google-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/icfj-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/instagram.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/liback.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/link.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/quotes.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/reply.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/retweet.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_email_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_facebook.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_facebook_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_google.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_google_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_linkedin.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_linkedin_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_pinterest.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_pinterest_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_twitter.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/social_twitter_color.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/soundcloud-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/tw-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/twitter-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/unpublish.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/img/youtube-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/base.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/posttype/wrapup.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/advertisement.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/comments.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/flickr.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/instagram.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/sms.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/twitter.dust
	plugins/livedesk-embed/gui-themes/themes/ctkepr/item/source/youtube.dust
	plugins/livedesk-embed/gui-themes/themes/ctkeu/img/comment-icon-bottom.png
	plugins/livedesk-embed/gui-themes/themes/ctkeu/img/icfj-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkeu/img/tw-16px.png
	plugins/livedesk-embed/gui-themes/themes/ctkeu/item/base.dust
	plugins/livedesk-embed/gui-themes/themes/ctkeu/item/source/advertisement.dust
	plugins/livedesk-embed/gui-themes/themes/ctkeu/item/source/facebook.dust
	plugins/livedesk-embed/gui-themes/themes/ctkno/item/annotated.dust
	plugins/livedesk-embed/gui-themes/themes/ctkno/item/item.dust
	plugins/livedesk-embed/gui-themes/themes/ctkno/item/social-share.dust
	plugins/livedesk-embed/gui-themes/themes/default.js
	plugins/livedesk-embed/gui-themes/themes/default/base-theme.less
	plugins/livedesk-embed/gui-themes/themes/default/img/facebook-16px.png
	plugins/livedesk-embed/gui-themes/themes/default/liveblog.css
	plugins/livedesk-embed/gui-themes/themes/default/livedesk.css
	plugins/livedesk-embed/gui-themes/themes/stt/container.dust
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/base-theme.less
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/img/big-toggle.png
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/img/instagram-16px.png
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/img/soundcloud-16px.png
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/item/base.dust
	plugins/livedesk-embed/gui-themes/themes/stt/desktop/liveblog.css
	plugins/livedesk-embed/gui-themes/themes/stt/img/soundcloud-16px.png
	plugins/livedesk-embed/gui-themes/themes/stt/item/social-share.dust
	plugins/livedesk-embed/gui-themes/themes/zeit.js
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop.js
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/base-theme.less
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/favorites.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/flickr-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/google-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/link.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/quotes.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/reply.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/retweet.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_email_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_facebook.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_facebook_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_google.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_google_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_linkedin.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_linkedin_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_pinterest.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_pinterest_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_twitter.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/social_twitter_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/twitter-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/unpublish.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/img/youtube-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/desktop/liveblog.css
	plugins/livedesk-embed/gui-themes/themes/zeit/img/big_toggle.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/favorites.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/fb-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/flickr-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/google-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/instagram.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/link.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/quotes.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/reply.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/retweet.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_email_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_facebook.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_facebook_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_google.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_google_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_linkedin.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_linkedin_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_pinterest.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_pinterest_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_twitter.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/social_twitter_color.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/twitter-16px.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/unpublish.png
	plugins/livedesk-embed/gui-themes/themes/zeit/img/youtube-16px.png
LB-751: Theme structure refactoring - use base theme

Added missing lib.