pass all tests and check
Merge branch 'master' of https://github.com/sbfnk/fitR

Conflicts:
	NAMESPACE
	R/ABC.r
	R/plot.r
	R/utils.r
	man/SEITL_distanceOscillation.Rd
	man/plotTraj.Rd
	man/simulateModelReplicates.Rd
Merge branch 'master' of https://github.com/sbfnk/fitR