Merge branch 'contactangle', remote-tracking branch 'origin' into contactangle
*add functions to compute system energies