integrating 4pc sum.stat into jaatha
Merge branch 'smoothing_border' into dm_sumstats

Conflicts:
	R/Jaatha.R
integrate 3d version of fpc sum stat
Merge branch 'develop' into dm_sumstats

Conflicts:
	R/Jaatha.R
	R/fit_glm.R
	inst/unitTests/runit.fit_glm.R
	inst/unitTests/test_setup.R
change fpc sum stat to 3d version
Merge branch 'develop' into dm_sumstats

Conflicts:
	DESCRIPTION
start implementation of fpc sum stats in c++
Merge branch 'develop' into dm_sumstats

Conflicts:
	DESCRIPTION
Merge branch 'develop' into dm_sumstats
move border function to correct sum.stat
implement extraction of seg.sites and jsfs in c++
integrate c++ sum.stats in sim_prog_ms
remove ms output parser
Update generated files
restructure sources
start implementing the actual fpc sum stat
complete 2-d version of fpc sum stat
change fpc sum.stats to traditional sum stat style
Merge branch 'develop' into dm_sumstats

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