Merge remote-tracking branch 'sourcefabric/sms-feed' into sms
Merge branch 'lb-425-sms-gateway' of https://github.com/msat-cont/Superdesk into sms
Merge branch 'lb-425-sms-gateway' of https://github.com/msat-cont/Superdesk into sms
LB-397: SMS source

Raw first faze
Merge branch 'lb-425-sms-gateway' of https://github.com/msat-cont/Superdesk into fullsms
Merge branch 'lb-425-sms-gateway' of https://github.com/msat-cont/Superdesk into fullsms
LB-397: SMS Source

with search and autoupdate
LB-652: Embed code isn't rendering well

fixed.
Merge pull request #117 from nistormihai/master

LB-652: Embed code isn't rendering well.
Merge remote-tracking branch 'sourcefabric/master' into devel
Update default.js
Sms merge branches
SMS tab - scrolling and search heder fixed
LB-666 : Users screen styling improvement

Fixed
LB-666 : Users screen styling improvement

Button fixed
LB-668 : Liveblog dasboard > archive tab - searchbox displaying bad

Fixed
LB-664 : Input elements doesn't look the same on the liveblog configure page

Fixed
LB-397: SMS Source

some fixes
LB-667 : Add new blog modal - styling improvement

Fixed
Merge remote-tracking branch 'sourcefabric/devel' into fullsms

Conflicts:
	plugins/livedesk-embed/gui-themes/themes/default/item/base.dust
	plugins/livedesk-embed/gui-themes/themes/stt/item/base.dust
	plugins/livedesk/__plugin__/livedesk/populate_default_data.py