[SD-2684] Changes were overwritten by one of the previous merge.
[SD-2684] Changes were overwritten by one of the previous merge.

mdhaman/superdesk,plamut/superdesk,gbbr/superdesk,pavlovicnemanja/superdesk,ioanpocol/superdesk,superdesk/superdesk,verifiedpixel/superdesk,marwoodandrew/superdesk-aap,marwoodandrew/superdesk-aap,marwoodandrew/superdesk-aap,Aca-jov/superdesk,verifiedpixel/superdesk,sivakuna-aap/superdesk,akintolga/superdesk,sivakuna-aap/superdesk,sivakuna-aap/superdesk,marwoodandrew/superdesk,petrjasek/superdesk-ntb,superdesk/superdesk-aap,superdesk/superdesk,thnkloud9/superdesk,superdesk/superdesk-ntb,hlmnrmr/superdesk,akintolga/superdesk,petrjasek/superdesk,marwoodandrew/superdesk,mugurrus/superdesk,liveblog/superdesk,superdesk/superdesk-ntb,pavlovicnemanja92/superdesk,mdhaman/superdesk-aap,marwoodandrew/superdesk,ioanpocol/superdesk-ntb,mdhaman/superdesk-aap,gbbr/superdesk,plamut/superdesk,superdesk/superdesk-ntb,sjunaid/superdesk,akintolga/superdesk,marwoodandrew/superdesk,sivakuna-aap/superdesk,superdesk/superdesk-aap,akintolga/superdesk-aap,superdesk/superdesk,petrjasek/superdesk,liveblog/superdesk,ancafarcas/superdesk,hlmnrmr/superdesk,superdesk/superdesk,pavlovicnemanja/superdesk,darconny/superdesk,thnkloud9/superdesk,ioanpocol/superdesk,plamut/superdesk,sjunaid/superdesk,akintolga/superdesk-aap,akintolga/superdesk,plamut/superdesk,plamut/superdesk,fritzSF/superdesk,hlmnrmr/superdesk,mdhaman/superdesk,ancafarcas/superdesk,pavlovicnemanja92/superdesk,pavlovicnemanja/superdesk,superdesk/superdesk-ntb,superdesk/superdesk-aap,verifiedpixel/superdesk,gbbr/superdesk,petrjasek/superdesk-ntb,fritzSF/superdesk,verifiedpixel/superdesk,mugurrus/superdesk,akintolga/superdesk,Aca-jov/superdesk,marwoodandrew/superdesk,thnkloud9/superdesk,petrjasek/superdesk,verifiedpixel/superdesk,marwoodandrew/superdesk-aap,mdhaman/superdesk,fritzSF/superdesk,mdhaman/superdesk-aap,petrjasek/superdesk,mugurrus/superdesk,fritzSF/superdesk,petrjasek/superdesk-ntb,pavlovicnemanja92/superdesk,amagdas/superdesk,Aca-jov/superdesk,amagdas/superdesk,petrjasek/superdesk-ntb,amagdas/superdesk,pavlovicnemanja/superdesk,amagdas/superdesk,amagdas/superdesk,ioanpocol/superdesk-ntb,akintolga/superdesk-aap,superdesk/superdesk-aap,liveblog/superdesk,sjunaid/superdesk,fritzSF/superdesk,mdhaman/superdesk-aap,pavlovicnemanja92/superdesk,pavlovicnemanja92/superdesk,darconny/superdesk,ioanpocol/superdesk,akintolga/superdesk-aap,ancafarcas/superdesk,ioanpocol/superdesk-ntb,liveblog/superdesk,sivakuna-aap/superdesk,liveblog/superdesk,darconny/superdesk