refacto
Merge branch 'master' of git@github.com:moea-chan/ATA_geoloc_media.git