Not all branches have fitbit enabled, so first check if fitbit_resource_credentials table is present
Merge remote-tracking branch 'origin/master' into nrc