jakies poprawki
elch
Merge remote-tracking branch 'marta/master'

Conflicts:
	src/Components/ClosedCloudMerge/ClosedCloudMerge.cpp
	src/Components/SOMJSONWriter/SOMJSONWriter.cpp
wazne poprawki
elech refactoring
poprawki elch
Merge branch 'master' of https://github.com/mkamionka/SIFTObjectModel

Conflicts:
	src/Components/ELECHGenerator/ELECHGenerator.cpp
	tasks/GenerateModelELECH.xml
Merge remote-tracking branch 'SIFT/master'
poprawki
Merge remote-tracking branch 'michal/master'

Conflicts:
	src/Components/CorrespondencesViewer/CorrespondencesViewer.cpp
	tasks/DisplayCorrespondences.xml
task adapted to file system
Merge remote-tracking branch 'michal/master'