merged modules/catmaidsopnet int sopnet/catmaid