added FitBit integration
Merge branch 'dev-branch'