Adjusted new entity dialog

Author: VitaliyBoyko

src/main/java/com/magento/idea/magento2plugin/actions/generation/dialog/NewEntityDialog.java

@@ -384,6 +384,7 @@ protected void onWriteActionOK() {
 
         generatorPoolHandler.run();
         onOkActionFired.setFinished(true);
+        exit();
     }
 
     @Override

src/main/java/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java

@@ -150,7 +150,7 @@ public PsiFile createFileFromTemplate(
             fileTemplate = templateManager.getInstance(project).getCodeTemplate(templateName);
         }
 
-        Properties mergedProperties = new Properties();
+        final Properties mergedProperties = new Properties();
         mergedProperties.putAll(FileTemplateManager.getInstance(project).getDefaultProperties());
         mergedProperties.putAll(properties);
         final String fileTemplateText = fileTemplate.getText(mergedProperties);