Add geolocation and file APIs
Merge remote-tracking branch 'origin/master'