data collector updates
Merge branch 'master' into pavel/development
fix merge issue; re-factor shared prefs
Merge branch 'pavel/development' of https://github.com/iveyalkin/device-radar
add real guid