rebuild docs
merge my local with remote

Merge branch 'development' of github.com:achubaty/SpaDES into development

Conflicts:
	man/makeColorMatrix.Rd
	man/setColors-method.Rd