final stages of fitbit JSON
Merge branch 'dev' into test
changes
Merge branch 'dev' into test
we have access to user JSON