first commit
Merge branch 'pal-hydro-devel' into hydro-devel

Conflicts:
	cfg/DisparitySegment.cfg
	cfg/HistogramSegment.cfg
	cfg/TemplateSegment.cfg