...
Manual update
Merge branch 'master' of https://github.com/ValcuMihai/expp

Conflicts:
	R/SpatialPointsBreeding.R
	man/SpatialPointsBreeding.Rd
	man/epp.Rd