Merge conflicts resolved

.gitignore

Comparison/pom.xml

...java/cz/fidentis/analyst/symmetry/AproxSymmetryPlane.java

...c/main/java/cz/fidentis/analyst/symmetry/BoundingBox.java

...on/src/main/java/cz/fidentis/analyst/symmetry/Config.java

...son/src/main/java/cz/fidentis/analyst/symmetry/Plane.java

.../java/cz/fidentis/analyst/symmetry/SymmetryEstimator.java

.../src/main/java/cz/fidentis/analyst/symmetry/Triangle.java

Comparison/src/main/nbm/manifest.mf

...c/main/resources/cz/findetis/comparison/Bundle.properties

FIDENTIS-Analyst-parent.iml

GUI/GUI.iml

GUI/pom.xml

GUI/src/main/java/cz/fidentis/analyst/gui/Canvas.form

...ava/cz/fidentis/analyst/gui/HelloWorldActionListener.java

GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.form

GUI/src/main/java/cz/fidentis/analyst/gui/SymmetryPanel.java

GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.form

GUI/src/main/java/cz/fidentis/analyst/gui/UserInterface.java

...src/main/java/cz/fidentis/analyst/gui/resources/angle.png