Update modules/catmaidsopnet
Merge remote-tracking branch 'origin/catmaid' into catmaid

Conflicts:
	modules/catmaidsopnet