Box: Bug fixes with regard to some geometry and type problems
ConflictSets: addAll function for other ConflictSets
Box: location and size are no longer pointers
Merge branch 'catmaid' of https://github.com/larrylindsey/sopnet into catmaid
updated submodules
Update modules/catmaidsopnet
Merge remote-tracking branch 'origin/catmaid' into catmaid

Conflicts:
	modules/catmaidsopnet