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

Synced with production