Add location picker
Merge branch 'master' of github.com:loopyz/Spire