Merge branch 'smoothing_border' into develop
increase version number
Merge branch 'develop' into dm_sumstats