Database + Layers
Merge branch 'master' of https://github.com/hermanos/audioguide
fix master