now using DB to store device's locations
Merge remote-tracking branch 'origin/master'