Merge pull request #858 from superdesk/devel

Devel
Merge pull request #860 from superdesk/devel

Devel
Squashed 'plugins/embed/' changes from e0fa3af..ba7ff04

ba7ff04 Merge pull request #251 from nistormihai/devel
a249216 B-1706 As STT, I want my production instances to be on 2.0 stable

git-subtree-dir: plugins/embed
git-subtree-split: ba7ff04013905e64fad9ace262f85cfb59d970e4
Merge commit 'e3288fd36aa78429a1c1c916a91b7eb0d59863c3'
Merge pull request #861 from nistormihai/master

Wrong build for main.js
Merge pull request #862 from superdesk/master

Master update