Merge
Reorg for image slices and catmaid services.