last changes
Merge branch 'design/campaigns_list' into staging