Merge branch 'master' of https://github.com/lontra/profileR

Conflicts:
	devel/NAMESPACE
	devel/man/cp.Rd