fix merge conflict
picture share feature changed contribution key to contributor key
Merge remote-tracking branch 'upstream/master' into bdtemp
merge conflict
Merge remote-tracking branch 'upstream/master'
started working on datawalk service
in the process of implementing the ability to record data in datawalk service
data records in service in datawalk but ui does not update
Merge remote-tracking branch 'origin/bdService' into bdService
datawalk at a service is working
merge conflict
merge conflict
datawalk is up and walking as a service
wrote a basic automated test for CRP
Merge pull request #1085 from bdonald25/bdtemp

Basic automated test for CRP
fixed default recording interval after reset
mergeing issues
Merge remote-tracking branch 'upstream/master' into bdtemp
datawalk accel not working is fixed
testing for crp