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

Synced with production