merging the ui changes
compilation warning fix
imported IdEditDialog.ui from v0.6-initdev branch