User CollectionUtils when applicable.
Do not add the shape multiple times.
Display results if shape already analyzed.
Merge pull request #2709 from jburel/rebased/develop/intensity-view-add

Intensity view add (rebased onto develop)