Properly implemented LocationListener so GPS doesn't stay on in the background.
Merge remote-tracking branch 'origin/master'