Synced with production
added dispay suite settings
Merge pull request #37 from dragos-dumi/master

Synced with production
Merge pull request #38 from cdog/master

Upgraded from cms_theme to cms_manage