added hotkey Esc on modal dialog
Merge branch 'develop'