Merge branch 'boxcarAverage' into develop
Merge branch 'boxcarAverage' into develop
ungrid() added [may change]
Merge branch 'develop' into boxcarAverage