Keeping up with local repository changes. Biggest addition is modularization of DsdAverage suite.
resolved merge conflicts