about dialog
Merge branch 'develop' into feature/htmlInject