Fixed android location provider
Merge remote-tracking branch 'upstream/master'
Merge pull request #94 from lukashaertel/master

Location fix