Merge branch 'develop' into boxcarAverage
Merge branch 'develop' into boxcarAverage
boxcarAverageMatrix() added
Merge branch 'boxcarAverage' into develop