Merge pull request #6 from marconak/develop

Merge develop branch from ARvis - fix when OpenCV not found
Fix build
Restriction for two planes

Restricts the selected nodes on two parallel planes
Added functions

Added vertigo mode for camera, changing the number of paralell planes
and distance between these planes
Added function - repulsive forces + fixes

changed the commentary style to
// Duransky - "code description"
Fix - reset number of planes

The version with this fix is present on the bachelor CD.
Cotire update to 1.6.0
Fixed linux build
[Build] Completely new CMake build from ARvis
[Fix] non-cotire build - missing headers
Commentary fix

Changed commentary format:
Duransky start - (method description)
...
Duransky end - (method description)
Merge branch 'hotfix/linux-build' into develop
fixed warning
Merge branch 'develop' of github.com:marekduransky/3dsoftviz into marekduransky-develop

Conflicts:
	CMakeLists.txt
	resources/config/config
	src/Layout/FRAlgorithm.cpp
	src/QOSG/CoreWindow.cpp
	src/QOpenCV/FaceRecognitionThread.cpp
	src/Viewer/CameraManipulator.cpp
	src/Viewer/CoreGraph.cpp
	src/Viewer/ShapeVisitor_VisualizerCreator.cpp
Merge branch 'marekduransky-develop' into hotfixes-mergingBP