Merge branch 'dev-javafx' into dev

# Conflicts:
#	pom.xml

pom.xml

@@ -3,11 +3,20 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <name>1S Corrector</name>
 
     <groupId>ru.dmitriymx</groupId>
     <artifactId>corrector-1s</artifactId>
+    <packaging>jar</packaging>
     <version>1.0-SNAPSHOT</version>
 
+    <developers>
+        <developer>
+            <name>DmitriyMX</name>
+            <email>dmiriymx@yandex.ru</email>
+        </developer>
+    </developers>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>
@@ -45,7 +54,6 @@
             <artifactId>poi-ooxml</artifactId>
             <version>3.17</version>
         </dependency>
-
     </dependencies>
 
     <build>
@@ -70,13 +78,16 @@
                 </configuration>
             </plugin>
             <!-- Fat jar -->
+            <!-- mvn assebly:single -->
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2-beta-5</version>
                 <configuration>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <archive>
                         <manifest>
-                            <mainClass>ru.dmitriymx.Main</mainClass>
+                            <mainClass>ru.dmitriymx.corrector1s.Main</mainClass>
                         </manifest>
                     </archive>
                     <descriptorRefs>
@@ -86,5 +97,4 @@
             </plugin>
         </plugins>
     </build>
-
-</project>
+</project>