change media column long to lng
Merge branch 'dev'

recursive merge conflict