Merge branch 'database'
Merge branch 'master' of https://github.com/geluso/panzoomtag