Add current geolocation marker
Change api uri
Merge branch 'dev' of github.com:otknoy/michishiki into dev