fix merge conflict
Issue edina/botanitours#4 use database with detailed zoom levels
Merge branch 'master' of github.com:edina/fieldtrip-open