Resolved conflicts

Comparison/pom.xml

Comparison/src/main/java/cz/fidentis/analyst/Project.java

...son/src/main/java/cz/fidentis/analyst/face/HumanFace.java

Comparison/src/main/java/cz/fidentis/analyst/icp/Icp.java

.../main/java/cz/fidentis/analyst/icp/IcpTransformation.java

.../java/cz/fidentis/analyst/symmetry/SignificantPoints.java

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

...ain/java/cz/fidentis/analyst/visitors/mesh/Curvature.java

.../cz/fidentis/analyst/visitors/mesh/GaussianCurvature.java

.../cz/fidentis/analyst/visitors/mesh/HausdorffDistance.java

.../java/cz/fidentis/analyst/visitors/mesh/MaxCurvature.java

GUI/pom.xml

...in/java/cz/fidentis/analyst/gui/AligmentTopComponent.form

...in/java/cz/fidentis/analyst/gui/AligmentTopComponent.java

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

...main/java/cz/fidentis/analyst/gui/CanvasTopComponent.java

...va/cz/fidentis/analyst/gui/ComparisonGLEventListener.java

.../fidentis/analyst/gui/ComparisonGLEventListener.java.orig

.../java/cz/fidentis/analyst/gui/GeneralGLEventListener.java

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