added method to combine similar lines
Merge branch 'haff-dev' of https://github.com/FormSeher/formseher into haff-dev
Added symmetric replacement method and tests. Tests have to be verified due to Qt bugs. Refering #94.
Added '-O0' QMAKE_CXX_FLAG_DEBUG to prevent compiler fallback to other optimization on debug config.
Removed not necessary debug output.
Fixes for Model destructor.
Added Model::operator=.
Merge pull request #101 from FormSeher/master

Update haff-dev with master
Fixed coloring of objects.
Now displaying name and coverage of detected objects.
Merge branch 'master' into haff-rating
Merge branch 'haff-dev' into haff-rating

Conflicts:
	algorithms/include/objectdetection/haff/haff.h
	test/include/objectdetection/haff/hypothesistest.h
Enabled symmetric supperssion in Haff.
Removed trimming of likelyHypothesis in Haff.
Made AlgorithmController::setDatabeseModels() thread safe.
Fixe bug which removed accidentially some of the likelyHypothesis.