@ html\dialogs: moved to gen. layout
Merge branch 'develop'
Merge branch 'develop'