DrawCSystem cleanup
Merge branch 'master' of github.com:mlaszko/SIFTObjectModel
correspondencematcher
ELCH fixes
correspondencematcher fixes
Merge branch 'master' of https://github.com/mkamionka/SIFTObjectModel

Conflicts:
	tasks/GenerateModelELECH.xml
	tasks/GenerateModelLUM.xml
fixy
Merge remote-tracking branch 'michal/master'

Conflicts:
	src/Components/ClosedCloudMerge/ClosedCloudMerge.cpp
	src/Components/ClosedCloudMerge/ClosedCloudMerge.hpp
	src/Components/FeatureCloudConverter/FeatureCloudConverter.cpp
	tasks/DisplayCloudCorrespondences.xml
fix maski w converterze
fix
Merge branch 'master' of github.com:mlaszko/SIFTObjectModel into merge
Compilation fixes (OpenCV nonfree, PCL viewport)
Merge branch 'master' of https://github.com/mkamionka/SIFTObjectModel into merge
merge
Moved point datatypes to PCLCoreTypes DCL
Merge remote-tracking branch 'discode/master'