Added an unique device ID to the data being exported
Merge remote-tracking branch 'github/master'