Merge pull request #238 from kurtwalker/master

 BISERVER-8578 - edit dialog