Add ellipse cos and hu-moments to SegmenterContour
Merge branch 'master' of github.com:lwinkler/markus

Conflicts:
	modules/SegmenterContour/SegmenterContour.cpp