Exclude the JSFS' border from smoothing
Merge branch 'smoothing_border' into develop
Merge branch 'develop' into dm_sumstats

Conflicts:
	DESCRIPTION
	R/Jaatha.R
fix bug with fpc default values