Merge branch 'boxcarAverage' into develop
fix bug in boxcarAverage()
Merge branch 'develop' into boxcarAverage