Fixes to second merging. Input is Cluster type, output is Cluster type. Changes to ClusterMerger to take this into account... now overwrites.
Merge branch 'trunk' of github.com:/larlight/LArLight into trunk