upstream
Merge branch 'master' of https://github.com/Sage-Bionetworks/rSCR.git

Conflicts:
	R/contributeMetadata.R