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
Update default.js
Sms merge branches
NR-879: Newsroom kanban view

Wrap missing strings into translate methods.
NR-964 : Template inrenationalization strings
Merge remote-tracking branch 'sourcefabric/aap' into aap
Merge pull request #125 from gizm0bill/aap

NR-964 : Template inrenationalization strings
NR-932 : NewsML General Wire Template

Implemented a basic newsML export.
Merge pull request #126 from chupym/aap

NR-932 : NewsML General Wire Template
Merge pull request #124 from petrjasek/aap

NR-879: Newsroom kanban view
SMS tab - scrolling and search heder fixed
Fixed mongoengine compatibility issue
NR-965 : article edit plugin tab contents overlapping

initial quickfix
Merge pull request #127 from gizm0bill/aap

NR-965 : article edit plugin tab contents overlapping