Keep a 'location' listener open until we get a GPS update…

…or the response is saved, whichever happens first.
Added some fixes for GPS
Updated the APK to 178a8e4
Fixed a bug in Location.js
Updated the APK to 5fab5ca
Fixed the merge conflict