Merge branch 'xseg-refactor' of ssh://ray.cslab.ece.ntua.gr/repos/archip into xseg...