finalized preliminary merging algos.
Merge branch 'trunk' of github.com:/larlight/LArLight into trunk