Resolved merge conflict

...son/src/main/java/cz/fidentis/analyst/BatchProcessor.java

...ain/java/cz/fidentis/analyst/face/AvgFaceConstructor.java

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

...rc/main/java/cz/fidentis/analyst/face/HumanFaceCache.java

.../main/java/cz/fidentis/analyst/face/HumanFaceFactory.java

...main/java/cz/fidentis/analyst/face/HumanFaceListener.java

...va/cz/fidentis/analyst/face/HumanFacePrivilegedCache.java

...src/main/java/cz/fidentis/analyst/icp/IcpTransformer.java

...rc/main/java/cz/fidentis/analyst/icp/NoUndersampling.java

...src/main/java/cz/fidentis/analyst/icp/RandomStrategy.java

...n/java/cz/fidentis/analyst/icp/UndersampledMeshFacet.java

...n/java/cz/fidentis/analyst/icp/UndersamplingStrategy.java

...z/fidentis/analyst/visitors/kdtree/KdTreeClosestNode.java

...a/cz/fidentis/analyst/visitors/kdtree/KdTreeDistance.java

.../cz/fidentis/analyst/gui/RegistrationGLEventListener.java

GUI/src/main/java/cz/fidentis/analyst/tests/BatchTests.java

.../main/java/cz/fidentis/analyst/tests/EfficiencyTests.java

...odel/src/main/java/cz/fidentis/analyst/kdtree/KdTree.java

...rc/main/java/cz/fidentis/analyst/mesh/core/MeshModel.java