picture share feature changed contribution key to contributor key
Merge remote-tracking branch 'upstream/master' into bdtemp
merge conflict
wrote a basic automated test for CRP
Merge pull request #1085 from bdonald25/bdtemp

Basic automated test for CRP