Merge branch 'develop'
_
関数名を変更(geoToCoord -> geoToPoint)
Merge branch 'master' into develop