Merge ClusterMergeAlg developed in a separate stream due to overhaul of the dataformat --kazu
Merge branch 'trunk' of github.com:larlight/LArLight into trunk