Working on Edit/View File dialog.
Merge remote-tracking branch 'veris/master'
Working on Edit/View File dialog.